Skip to content

Commit

Permalink
♻️ Cleaned some code
Browse files Browse the repository at this point in the history
  • Loading branch information
@Nixxen
Nixxen committed Nov 14, 2022
1 parent fcf7698 commit f9aedc9
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 29 deletions.
2 changes: 1 addition & 1 deletion ROI/ROI.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def detect_roi(self, image, landmarks):
roi_min_y = minimum_y*image_height - delta_y*0.1
roi_max_y = maximum_y*image_height + delta_y*0.1

self.roi_detected = 'true'
self.roi_detected = True

self.roi_polygon = np.array([[(roi_min_x , roi_max_y), (roi_min_x, roi_min_y),
(roi_max_x, roi_min_y), (roi_max_x, roi_max_y)]], dtype= np.int32)
Expand Down
9 changes: 6 additions & 3 deletions Utility/utility.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@


def whiteness_offset(img) -> float:
"""Uses the amount of white vs other noise in the image to decide a threshold for background removal
"""Uses the amount of white vs other noise in the image to decide a
threshold for background removal
Args:
img (np.nparray): The image to calculate the threshold for
Expand All @@ -28,10 +29,12 @@ def define_body_part(lm_id: int, landmarks: list, threshold: float = 0.5) -> tup
Args:
id (int): The id of the body part, based on PoseLandmark enum
landmarks (list): The landmarks from the pose detection
threshold (float, optional): The threshold to use for the detection. Defaults to 0.5.
threshold (float, optional): The threshold to use for the detection.
Defaults to 0.5.
Returns:
tuple: The x and y coordinates of the body part. If the body part is not visible, an empty tuple is returned
tuple: The x and y coordinates of the body part. If the body part is
not visible, an empty tuple is returned
"""
return (
(
Expand Down
48 changes: 23 additions & 25 deletions main.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import cv2 # type: ignore
import mediapipe as mp # type: ignore

from datebase.add_record import add_record # type: ignore
from datebase.add_record import add_record # type: ignore
from Detector.Detector import Detector # type: ignore
from ROI.ROI import ROI # type: ignore
from SelfieSegmentation.selfie_segmentation import SelfieSegmentation # type: ignore
Expand All @@ -26,9 +26,9 @@

if __name__ == "__main__":

start_time = 0
duration_time = 60
remaining_time = 60
start_time = 0.0
duration_time = 60.0
remaining_time = 60.0

push_up = Exercise()
# instance of the detector class
Expand Down Expand Up @@ -57,79 +57,72 @@
# (nothing here) and frame is the image)
ret, my_frame = cap.read()

threshold = whiteness_offset(my_frame)
bg_image = cv2.GaussianBlur(my_frame, (55, 55), 0)
# clean_img = segmenter.removeBG(
# my_frame, imgBg=bg_image, threshold=threshold
# )
clean_img = my_frame # TODO: Re-enable clean_image if possible

if roi.roi_detected:
clean_img = roi.add_region_of_interest(clean_img)
my_frame = roi.add_region_of_interest(my_frame)

my_image, my_results = detector.make_detections(clean_img)
my_image, my_results = detector.make_detections(my_frame)

# Extract landmarks
try:
my_landmarks = my_results.pose_landmarks.landmark
# my_image = create_region_of_interest(my_image, my_landmarks)

if push_up.reps and not roi.roi_detected:
roi.detect_roi(my_image, my_landmarks)

visibility_threshold = 0.6
VISIBILITY_THRESHOLD = 0.6

# Get the coordinates that we are interested in
shoulder_left = define_body_part(
mp_pose.PoseLandmark.LEFT_SHOULDER.value,
my_landmarks,
visibility_threshold,
VISIBILITY_THRESHOLD,
)
elbow_left = define_body_part(
mp_pose.PoseLandmark.LEFT_ELBOW.value,
my_landmarks,
visibility_threshold,
VISIBILITY_THRESHOLD,
)
wrist_left = define_body_part(
mp_pose.PoseLandmark.LEFT_WRIST.value,
my_landmarks,
visibility_threshold,
VISIBILITY_THRESHOLD,
)
hip_left = define_body_part(
mp_pose.PoseLandmark.LEFT_HIP.value,
my_landmarks,
visibility_threshold,
VISIBILITY_THRESHOLD,
)
knee_left = define_body_part(
mp_pose.PoseLandmark.LEFT_KNEE.value,
my_landmarks,
visibility_threshold,
VISIBILITY_THRESHOLD,
)

shoulder_right = define_body_part(
mp_pose.PoseLandmark.RIGHT_SHOULDER.value,
my_landmarks,
visibility_threshold,
VISIBILITY_THRESHOLD,
)
elbow_right = define_body_part(
mp_pose.PoseLandmark.RIGHT_ELBOW.value,
my_landmarks,
visibility_threshold,
VISIBILITY_THRESHOLD,
)
wrist_right = define_body_part(
mp_pose.PoseLandmark.RIGHT_WRIST.value,
my_landmarks,
visibility_threshold,
VISIBILITY_THRESHOLD,
)
hip_right = define_body_part(
mp_pose.PoseLandmark.RIGHT_HIP.value,
my_landmarks,
visibility_threshold,
VISIBILITY_THRESHOLD,
)
knee_right = define_body_part(
mp_pose.PoseLandmark.RIGHT_KNEE.value,
my_landmarks,
visibility_threshold,
VISIBILITY_THRESHOLD,
)

push_up.update_state(
Expand Down Expand Up @@ -256,9 +249,14 @@
cv2.LINE_AA,
)

# Get landmarks list
lmList = detector.get_interest_points(frame=my_image, results=my_results)

# Draw circles on angle keypoints
detector.mask_point(frame=my_image, lmList=lmList, pointID=13)
detector.mask_point(frame=my_image, lmList=lmList, pointID=14)
detector.mask_point(frame=my_image, lmList=lmList, pointID=23)
detector.mask_point(frame=my_image, lmList=lmList, pointID=24)

# Draws the pose landmarks and the connections between them to the image
detector.draw_pose_pose_landmark(frame=my_image, results=my_results)
Expand Down

0 comments on commit f9aedc9

Please sign in to comment.