diff --git a/Exercise3/tricep_dip.py b/Exercise3/tricep_dip.py index 4cdbb25..c893f3a 100644 --- a/Exercise3/tricep_dip.py +++ b/Exercise3/tricep_dip.py @@ -147,7 +147,7 @@ class Tricep_dip_1(BaseExercise): self.heel = heel_y self.speak_driver.add_speak("上杠,听到提示声后开始考试") if self.readiness_state == 1: - if (elbow_1 > 157 or elbow_2 > 157)and eye_1_y < wrist_1_y and eye_2_y < wrist_2_y and (shoulder_1 < 30 or shoulder_2 < 30) and heel_y < self.heel - 30: + if (elbow_1 > 157 or elbow_2 > 157) and eye_1_y < wrist_1_y and eye_2_y < wrist_2_y and (shoulder_1 < 30 or shoulder_2 < 30) and heel_y < self.heel - 30: self.time_0 += 1 if self.time_0 > 15: if vis_shoulder_1 > 0.8 and vis_shoulder_1 > vis_shoulder_2: @@ -189,7 +189,7 @@ class Tricep_dip_1(BaseExercise): self.state = 0 self.time = 0 - if elbow_1 >= 146 and shoulder_1_y < elbow_1_y and shoulder_1_y < self.initial_wrist_1_y - 30 and shoulder_angle > 60 and self.count > 0 and wrist_1_y - self.initial_wrist_1_y < 50: + if elbow_1 >= 146 and shoulder_1_y < elbow_1_y and shoulder_1_y < self.initial_wrist_1_y - 30 and shoulder_angle > 45 and self.count > 0 and wrist_1_y - self.initial_wrist_1_y < 50: self.feedback = "下落" if self.state == 0: self.time += 1 @@ -209,7 +209,7 @@ class Tricep_dip_1(BaseExercise): # self.pre_pos = 2 # self.had_done = True - if elbow_2 <= 93 and shoulder_2_y >= elbow_2_y and wrist_2_y - self.initial_wrist_2_y < 50: + if elbow_2 <= 95 and shoulder_2_y >= elbow_2_y and wrist_2_y - self.initial_wrist_2_y < 50: self.feedback = "上升" if self.state == 1: self.time += 1 @@ -218,7 +218,7 @@ class Tricep_dip_1(BaseExercise): self.state = 0 self.time = 0 - if elbow_2 >= 146 and shoulder_2_y < elbow_2_y and shoulder_2_y < self.initial_wrist_2_y - 30 and shoulder_angle > 60 and self.count > 0 and wrist_2_y - self.initial_wrist_2_y < 50: + if elbow_2 >= 146 and shoulder_2_y < elbow_2_y and shoulder_2_y < self.initial_wrist_2_y - 30 and shoulder_angle > 45 and self.count > 0 and wrist_2_y - self.initial_wrist_2_y < 50: self.feedback = "下落" if self.state == 0: self.time += 1