diff --git a/MisplaceAI/process_misplaced_manager/views.py b/MisplaceAI/process_misplaced_manager/views.py
index 67c7a8aaec31aea426fe09e0c67e760cf65ba7a0..3724d1075eec4ece8d58242ae8434705508a15dd 100644
--- a/MisplaceAI/process_misplaced_manager/views.py
+++ b/MisplaceAI/process_misplaced_manager/views.py
@@ -9,7 +9,7 @@ from .models import UploadedImage, UploadedVideo, UserVideoFramePreference, Dete
from .serializers import UploadedImageSerializer, UploadedVideoSerializer
from item_detector.utils import run_inference, load_model, create_category_index_from_labelmap
from placement_rules.utils import PlacementRules
-from results_viewer.utils import visualize_misplaced_objects, visualize_video_misplaced_objects, visualize_pil_misplaced_objects
+from results_viewer.utils import visualize_misplaced_objects, visualize_pil_misplaced_objects
from django.core.files.base import ContentFile
import base64
import os
@@ -203,6 +203,7 @@ def display_video_results(request, video_id):
except Exception as e:
print(f"Error processing video results: {e}")
return JsonResponse({'error': str(e)}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
def process_video_for_misplaced_objects(video_path, frame_interval, frame_delay):
@@ -222,6 +223,7 @@ def process_video_for_misplaced_objects(video_path, frame_interval, frame_delay)
print("Detected objects list created")
frame_count = 0
+ annotated_frame_count = 1 # Start frame count from 1 for annotated frames
frame_interval_frames = frame_interval * fps
annotated_frames = []
@@ -250,19 +252,22 @@ def process_video_for_misplaced_objects(video_path, frame_interval, frame_delay)
detected_objects_all_frames.append(detected_objects)
misplaced_objects_all_frames.append(misplaced_objects)
- # Annotate the frame with bounding boxes and labels
- annotated_image_pil = visualize_pil_misplaced_objects(image_pil, detected_objects, misplaced_objects)
+ # Annotate the frame with bounding boxes, labels, and annotated frame number
+ annotated_image_pil = visualize_pil_misplaced_objects(image_pil, detected_objects, misplaced_objects, annotated_frame_count)
annotated_image_np = np.array(annotated_image_pil)
annotated_frames.append(annotated_image_np)
+ # Increment the annotated frame count
+ annotated_frame_count += 1
+
frame_count += 1
cap.release()
# Create a video with a specified delay between each frame
output_video_path = os.path.join(settings.MEDIA_ROOT, 'videos', os.path.basename(video_path).replace('.mp4', '_annotated.mp4'))
- annotated_clip = ImageSequenceClip([np.array(frame) for frame in annotated_frames], fps=1/frame_delay)
- annotated_clip.write_videofile(output_video_path, codec='libx264', audio_codec='aac')
+ annotated_clip = ImageSequenceClip(annotated_frames, fps=1/frame_delay)
+ annotated_clip.write_videofile(output_video_path, fps=fps, codec='libx264', audio_codec='aac')
print("Finished processing video:", output_video_path)
return detected_objects_all_frames, misplaced_objects_all_frames, output_video_path
diff --git a/MisplaceAI/results_viewer/utils.py b/MisplaceAI/results_viewer/utils.py
index 9a59bd42c70978ea07d5204fc3dfef1c9f26e0bd..7a6f3a1a97d4add05a1703ca4b4359d7e437e927 100644
--- a/MisplaceAI/results_viewer/utils.py
+++ b/MisplaceAI/results_viewer/utils.py
@@ -63,13 +63,25 @@ def visualize_misplaced_objects(image_path, detected_objects, misplaced_objects)
-def visualize_pil_misplaced_objects(image_pil, detected_objects, misplaced_objects):
+
+
+def visualize_pil_misplaced_objects(image_pil, detected_objects, misplaced_objects, frame_number):
"""Visualize misplaced objects with annotations on a PIL image."""
draw = ImageDraw.Draw(image_pil)
width, height = image_pil.size
misplaced_names = [obj["class_name"] for obj in misplaced_objects]
+ # Draw frame number on the top-left corner with a larger font size
+ frame_text = f"Frame {frame_number}"
+ font_size = 300 # Set a larger font size
+ try:
+ font = ImageFont.truetype("arial.ttf", font_size)
+ except IOError:
+ font = ImageFont.load_default() # Fallback to default font
+
+ draw.text((10, 10), frame_text, fill="yellow", font=font)
+
for obj in detected_objects:
ymin, xmin, ymax, xmax = [
obj["ymin"] * height,
@@ -80,64 +92,6 @@ def visualize_pil_misplaced_objects(image_pil, detected_objects, misplaced_objec
color = "green" if obj["class_name"] not in misplaced_names else "red"
draw.rectangle([xmin, ymin, xmax, ymax], outline=color, width=2)
- draw.text((xmin, ymin), f"{'Misplaced: ' if obj['class_name'] in misplaced_names else ''}{obj['class_name']}", fill=color)
+ draw.text((xmin, ymin), f"{'Misplaced: ' if obj['class_name'] in misplaced_names else ''}{obj['class_name']}", fill=color, font=font)
return image_pil
-
-def visualize_video_misplaced_objects(video_path, detection_model, category_index):
- cap = cv2.VideoCapture(video_path)
- misplaced_objects_list = []
- detected_objects_list = []
-
- while cap.isOpened():
- ret, frame = cap.read()
- if not ret:
- break
-
- # Convert frame to RGB
- frame_rgb = cv2.cvtColor(frame, cv2.COLOR_BGR2RGB)
- frame_pil = Image.fromarray(frame_rgb)
-
- # Detect objects in the frame
- detected_objects = run_inference(detection_model, category_index, frame_pil)
- detected_objects_list.extend(detected_objects)
-
- # Check for misplaced objects
- placement_rules = PlacementRules()
- misplaced_objects = placement_rules.check_placement(detected_objects)
- misplaced_objects_list.extend(misplaced_objects)
-
- # Draw bounding boxes on the frame (optional for visualization purposes)
- for obj in detected_objects:
- ymin, xmin, ymax, xmax = [
- obj["ymin"] * frame_pil.height,
- obj["xmin"] * frame_pil.width,
- obj["ymax"] * frame_pil.height,
- obj["xmax"] * frame_pil.width,
- ]
-
- rect = patches.Rectangle(
- (xmin, ymin),
- xmax - xmin,
- ymax - ymin,
- linewidth=2,
- edgecolor="green" if obj["class_name"] not in misplaced_objects else "red",
- facecolor="none",
- )
- plt.gca().add_patch(rect)
-
- plt.text(
- xmin,
- ymin,
- f"{'Misplaced: ' if obj['class_name'] in misplaced_objects else ''}{obj['class_name']}",
- color="red" if obj["class_name"] in misplaced_objects else "green",
- fontsize=12,
- verticalalignment="bottom",
- )
-
- plt.imshow(frame_pil)
- plt.axis("off")
- plt.show() # or save frame
-
- cap.release()
- return detected_objects_list, misplaced_objects_list
\ No newline at end of file
diff --git a/README.md b/README.md
deleted file mode 100644
index 354b4ca48823ecd23029923f55e30558ab52363b..0000000000000000000000000000000000000000
--- a/README.md
+++ /dev/null
@@ -1,179 +0,0 @@
-# Identification of Misplaced Items
-
-ngrok http 8080
-
-
-
-
-docker-compose down
-docker-compose up -d
-
-docker-compose up --build
-## DATABASE
-
-### Connect though terminal
-
-```bash
-docker exec -it identification-of-misplaced-items-db-1 mysql -u root -p
-```
-<br>
-Then enter password
-
-```bash
-Enter password: rootpassword
-```
-
-<br>
-Select Database:
-```bash
-mysql> USE misplaceai;
-```
-
-### Drop all tables
-
-Disable foreign key checks:
-
-``bash
-SET FOREIGN_KEY_CHECKS = 0;
-```
-
-Generate and execute the drop script:
-
-```bash
-SET @tables = NULL;
-SELECT GROUP_CONCAT('`', table_name, '`') INTO @tables
-FROM information_schema.tables
-WHERE table_schema = (SELECT DATABASE());
-
-SET @tables = CONCAT('DROP TABLE IF EXISTS ', @tables);
-PREPARE stmt FROM @tables;
-EXECUTE stmt;
-DEALLOCATE PREPARE stmt;
-
-```
-
-Enable foreign key checks:
-
-```bash
-SET FOREIGN_KEY_CHECKS = 1;
-
-```
-
-Verify that all tables are dropped:
-
-```sql
-SHOW TABLES;
-```
-
-exir
-
-```bash
-mysql> EXIT;
-Bye
-```
-
-
-##
-migrations
-```bash
-docker-compose exec web python manage.py makemigrations
-docker-compose exec web python manage.py migrate
-```
-
-create superuser:
-
-``` bashhttps://wrb.uwe.ac.uk/Scientia/Portal/Login.aspx?ReturnUrl=%2fScientia%2fPortal%2fMain.aspx
-
-docker-compose exec web python manage.py createsuperuser
-```
-
-
-## Getting started
-
-To make it easy for you to get started with GitLab, here's a list of recommended next steps.
-
-Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)!
-
-## Add your files
-
-- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files
-- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command:
-
-```
-cd existing_repo
-git remote add origin https://gitlab.uwe.ac.uk/a2-imeri/identification-of-misplaced-items.git
-git branch -M main
-git push -uf origin main
-```
-
-## Integrate with your tools
-
-- [ ] [Set up project integrations](https://gitlab.uwe.ac.uk/a2-imeri/identification-of-misplaced-items/-/settings/integrations)
-
-## Collaborate with your team
-
-- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/)
-- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html)
-- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
-- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/)
-- [ ] [Set auto-merge](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html)
-
-## Test and Deploy
-
-Use the built-in continuous integration in GitLab.
-
-- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html)
-- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing (SAST)](https://docs.gitlab.com/ee/user/application_security/sast/)
-- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html)
-- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/)
-- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html)
-
-***
-
-# Editing this README
-
-When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thanks to [makeareadme.com](https://www.makeareadme.com/) for this template.
-
-## Suggestions for a good README
-
-Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information.
-
-## Name
-Choose a self-explaining name for your project.
-
-## Description
-Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors.
-
-## Badges
-On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge.
-
-## Visuals
-Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method.
-
-## Installation
-Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection.
-
-## Usage
-Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README.
-
-## Support
-Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc.
-
-## Roadmap
-If you have ideas for releases in the future, it is a good idea to list them in the README.
-
-## Contributing
-State if you are open to contributions and what your requirements are for accepting them.
-
-For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self.
-
-You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser.
-
-## Authors and acknowledgment
-Show your appreciation to those who have contributed to the project.
-
-## License
-For open source projects, say how it is licensed.
-
-## Project status
-If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers.