Merge branch 'dev'

Algostu · Nov 5, 2019 · 315dc18 · 315dc18
2 parents 24dbe3d + 6cb5c7f
commit 315dc18
Show file tree

Hide file tree

Showing 693 changed files with 208,903 additions and 2,103 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,9 @@
 **/__pycache__/
 openpose/**
-*.mp4
-*.png
 *.jpg
 *.avi
 todo.txt
 **/.idea/
-**/.pytest_cache/
+**/.pytest_cache/
+temp/**
+*.db
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/pose-difference.iml b/.idea/pose-difference.iml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/pose_diff/core/temp/__init__.py → __init__.py b/pose_diff/core/temp/__init__.py → __init__.py
diff --git a/data/trainer/exercise/raw/output_json/trainer_ex_000000000000_keypoints.json b/data/trainer/exercise/raw/output_json/trainer_ex_000000000000_keypoints.json
diff --git a/data/trainer/exercise/raw/output_json/trainer_ex_000000000001_keypoints.json b/data/trainer/exercise/raw/output_json/trainer_ex_000000000001_keypoints.json
diff --git a/data/trainer/exercise/raw/output_json/trainer_ex_000000000002_keypoints.json b/data/trainer/exercise/raw/output_json/trainer_ex_000000000002_keypoints.json
diff --git a/data/trainer/exercise/raw/output_json/trainer_ex_000000000003_keypoints.json b/data/trainer/exercise/raw/output_json/trainer_ex_000000000003_keypoints.json
diff --git a/data/trainer/exercise/raw/output_json/trainer_ex_000000000004_keypoints.json b/data/trainer/exercise/raw/output_json/trainer_ex_000000000004_keypoints.json
diff --git a/data/trainer/exercise/raw/output_json/trainer_ex_000000000005_keypoints.json b/data/trainer/exercise/raw/output_json/trainer_ex_000000000005_keypoints.json
diff --git a/data/trainer/exercise/raw/output_json/trainer_ex_000000000006_keypoints.json b/data/trainer/exercise/raw/output_json/trainer_ex_000000000006_keypoints.json
diff --git a/data/trainer/exercise/raw/output_json/trainer_ex_000000000007_keypoints.json b/data/trainer/exercise/raw/output_json/trainer_ex_000000000007_keypoints.json
diff --git a/data/trainer/exercise/raw/output_json/trainer_ex_000000000008_keypoints.json b/data/trainer/exercise/raw/output_json/trainer_ex_000000000008_keypoints.json
diff --git a/data/trainer/exercise/raw/output_json/trainer_ex_000000000009_keypoints.json b/data/trainer/exercise/raw/output_json/trainer_ex_000000000009_keypoints.json
diff --git a/data/trainer/exercise/raw/output_json/trainer_ex_000000000010_keypoints.json b/data/trainer/exercise/raw/output_json/trainer_ex_000000000010_keypoints.json
diff --git a/data/trainer/exercise/raw/output_json/trainer_ex_000000000011_keypoints.json b/data/trainer/exercise/raw/output_json/trainer_ex_000000000011_keypoints.json
diff --git a/data/trainer/exercise/raw/output_json/trainer_ex_000000000012_keypoints.json b/data/trainer/exercise/raw/output_json/trainer_ex_000000000012_keypoints.json
diff --git a/data/trainer/exercise/raw/output_json/trainer_ex_000000000013_keypoints.json b/data/trainer/exercise/raw/output_json/trainer_ex_000000000013_keypoints.json
diff --git a/data/trainer/exercise/raw/output_json/trainer_ex_000000000014_keypoints.json b/data/trainer/exercise/raw/output_json/trainer_ex_000000000014_keypoints.json
diff --git a/data/trainer/exercise/raw/output_json/trainer_ex_000000000015_keypoints.json b/data/trainer/exercise/raw/output_json/trainer_ex_000000000015_keypoints.json
diff --git a/data/trainer/exercise/raw/output_json/trainer_ex_000000000016_keypoints.json b/data/trainer/exercise/raw/output_json/trainer_ex_000000000016_keypoints.json
diff --git a/data/trainer/exercise/raw/output_json/trainer_ex_000000000017_keypoints.json b/data/trainer/exercise/raw/output_json/trainer_ex_000000000017_keypoints.json
diff --git a/data/trainer/exercise/raw/output_json/trainer_ex_000000000018_keypoints.json b/data/trainer/exercise/raw/output_json/trainer_ex_000000000018_keypoints.json
diff --git a/data/trainer/exercise/raw/output_json/trainer_ex_000000000019_keypoints.json b/data/trainer/exercise/raw/output_json/trainer_ex_000000000019_keypoints.json
diff --git a/data/trainer/exercise/raw/output_json/trainer_ex_000000000020_keypoints.json b/data/trainer/exercise/raw/output_json/trainer_ex_000000000020_keypoints.json
diff --git a/data/trainer/exercise/raw/output_json/trainer_ex_000000000021_keypoints.json b/data/trainer/exercise/raw/output_json/trainer_ex_000000000021_keypoints.json
diff --git a/data/trainer/exercise/raw/output_json/trainer_ex_000000000022_keypoints.json b/data/trainer/exercise/raw/output_json/trainer_ex_000000000022_keypoints.json
diff --git a/data/trainer/exercise/raw/output_json/trainer_ex_000000000023_keypoints.json b/data/trainer/exercise/raw/output_json/trainer_ex_000000000023_keypoints.json
diff --git a/data/trainer/exercise/raw/output_json/trainer_ex_000000000024_keypoints.json b/data/trainer/exercise/raw/output_json/trainer_ex_000000000024_keypoints.json