Browse Source

add analyse.

lyc8503 4 years ago
parent
commit
0b50c06a55
1 changed files with 13 additions and 1 deletions
  1. 13 1
      backend_refactor/service/video_analyzer.py

+ 13 - 1
backend_refactor/service/video_analyzer.py

@@ -7,7 +7,8 @@ import logging
 
 from service.aiutil.torch_openpose import torch_openpose
 from service.aiutil.util import draw_bodypose
-from service.analyze.inner_analyze import analyse_npy_side_juanfu
+from service.analyze.inner_analyze import analyse_npy_side_juanfu, analyse_npy_side_shendun, analyse_npy_side_gaotaitui, \
+    analyse_npy_side_jump
 
 
 def run_openpose_for_npy_and_video(video_uuid):
@@ -91,13 +92,16 @@ from service.video_score.juanfu import ignore_data_juanfu
 from service.video_score.shendun import ignore_data_shendun
 from service.video_score.gaotaitui import ignore_data_gaotaitui
 
+
 class JumpAnalyzer(BaseVideoAnalyzer):
     def _do_analyze(self):
+        self.results = {k: analyse_npy_side_jump(v) for k, v in self.results.items()}
         return {"data": cal_jump(self.results)[1], "advice": "AI组说还没写完"}
 
 
 class PingbanAnalyzer(BaseVideoAnalyzer):
     def _do_analyze(self):
+        self.results = {k: analyse_npy_side_jump(v) for k, v in self.results.items()}
         return {"data": cal_pingban(self.results)[1], "advice": "AI组说还没写完"}
 
 
@@ -109,39 +113,47 @@ class JuanfuAnalyzer(BaseVideoAnalyzer):
 
 class ShendunAnalyzer(BaseVideoAnalyzer):
     def _do_analyze(self):
+        self.results = {k: analyse_npy_side_shendun(v) for k, v in self.results.items()}
         return {"data": ignore_data_shendun(self.results)[1], "advice": "AI组说还没写完"}
 
 
 class GaotaituiAnalyzer(BaseVideoAnalyzer):
     def _do_analyze(self):
+        self.results = {k: analyse_npy_side_gaotaitui(v) for k, v in self.results.items()}
         return {"data": ignore_data_gaotaitui(self.results)[1], "advice": "AI组说还没写完"}
 
 
 class TrunaroundAnalyzer(BaseVideoAnalyzer):
     def _do_analyze(self):
+        self.results = {k: analyse_npy_side_jump(v) for k, v in self.results.items()}
         return {"data": cal_turnaround(self.results)[1], "advice": "AI组说还没写完"}
 
 
 class TennisthrowAnalyzer(BaseVideoAnalyzer):
     def _do_analyze(self):
+        self.results = {k: analyse_npy_side_jump(v) for k, v in self.results.items()}
         return {"data": cal_tennisthrow(self.results)[1], "advice": "AI组说还没写完"}
 
 
 class JumpwithbothAnalyzer(BaseVideoAnalyzer):
     def _do_analyze(self):
+        self.results = {k: analyse_npy_side_jump(v) for k, v in self.results.items()}
         return {"data": cal_jumpwithboth(self.results)[1], "advice": "AI组说还没写完"}
 
 
 class SitforwardAnalyzer(BaseVideoAnalyzer):
     def _do_analyze(self):
+        self.results = {k: analyse_npy_side_jump(v) for k, v in self.results.items()}
         return {"data": cal_sitforward(self.results)[1], "advice": "AI组说还没写完"}
 
 
 class BalancebeamAnalyzer(BaseVideoAnalyzer):
     def _do_analyze(self):
+        self.results = {k: analyse_npy_side_jump(v) for k, v in self.results.items()}
         return {"data": cal_balancebeam(self.results)[1], "advice": "AI组说还没写完"}
 
 
 class StandingAnalyzer(BaseVideoAnalyzer):
     def _do_analyze(self):
+        self.results = {k: analyse_npy_side_jump(v) for k, v in self.results.items()}
         return {"data": cal_standing(self.results)[1], "advice": "AI组说还没写完"}