Skip to content

Free Motion Capture for Everyone πŸ’€βœ¨

TypeScript

hopefully fixed ruamel.yaml problems

jon matthis109ea0aec470
diff --git a/freemocap/fmc_deeplabcut.py b/freemocap/fmc_deeplabcut.py
index 34d16583..00487739 100644
--- a/freemocap/fmc_deeplabcut.py
+++ b/freemocap/fmc_deeplabcut.py
@@ -8,7 +8,8 @@ import glob
import numpy as np
import pandas as pd
import matplotlib.pyplot as plt
-import yaml
+from ruamel.yaml import YAML
+
from pathlib import Path
import h5py
@@ -19,7 +20,8 @@ def parseDeepLabCut(
): # NOTE this is assuming both the dlc config file and dlc data h5 foles are in the same folder specified in the session.dlcDataPath, if that is not the case either dlcconfig or h5files variable need to be changed
dlcConfig = config_path # File path for dlcConfig file
-
+ yaml=YAML()
+
with open(dlcConfig) as configFile:
# Open the config file
configList = yaml.load(configFile, Loader=yaml.FullLoader)
diff --git a/freemocap/user_preferences.yaml b/freemocap/user_preferences.yaml
index f38cfbf9..7cfa5882 100644
--- a/freemocap/user_preferences.yaml
+++ b/freemocap/user_preferences.yaml
@@ -13,6 +13,7 @@ saved:
rotations:
0: 0
2: 0
+ 3: 0
parameters:
exposure: -7
resWidth: 640
diff --git a/freemocap/webcamGUI.py b/freemocap/webcamGUI.py
index 72ddad65..a61070ea 100644
--- a/freemocap/webcamGUI.py
+++ b/freemocap/webcamGUI.py
@@ -1,5 +1,4 @@
from pathlib import Path
-from ruamel.yaml import YAML
import datetime
import sys
import pandas as pd
diff --git a/requirements.txt b/requirements.txt
index 4dcdb2e2..51532ced 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@ aniposelib~=0.4.1
h5py>=3.1.0
imutils~=0.5.4
matplotlib~=3.1.3
-mediapipe~=0.8.6
+mediapipe==0.8.6
opencv-contrib-python~=3.4.14.51
pandas~=1.2.5
rich~=10.4.0