Free Motion Capture for Everyone πβ¨
TypeScript
pypi bumbling lol
jon matthis6f1a0a4d9f33
diff --git a/freemocap/fmc_runme.py b/freemocap/fmc_runme.pyindex 8b10fb5d..5f9f2b2b 100644--- a/freemocap/fmc_runme.py+++ b/freemocap/fmc_runme.py@@ -27,9 +27,9 @@ from ruamel.yaml import YAMLdef RunMe(sessionID=None,stage=1,- useOpenPose=True,- runOpenPose = False,- useMediaPipe=False,+ useOpenPose=False,+ runOpenPose = True,+ useMediaPipe=True,useDLC=False,runMediaPipe=False,dlcConfigPath=None,@@ -37,7 +37,7 @@ def RunMe(sessionID=None,setDataPath = False,userDataPath = None,recordVid = True,- reconstructionConfidenceThreshold = .8,+ reconstructionConfidenceThreshold = .7,charucoSquareSize = 36,#mm - ~the size of the squares when printed on 8.5x11" paper based on parameters in ReadMe.mdcalVideoFrameLength = 120,):diff --git a/freemocap/user_preferences.yaml b/freemocap/user_preferences.yamlindex 0b348102..9c1c3b1c 100644--- a/freemocap/user_preferences.yaml+++ b/freemocap/user_preferences.yaml@@ -12,10 +12,7 @@ saved:path_to_save: C:/Users/jonma/Dropbox/FreeMoCapProjectrotations:0: 0- 1: 02: 0- 3: 0- 4: 0parameters:exposure: -7resWidth: 640diff --git a/freemocap/webcam/camsetup.py b/freemocap/webcam/camsetup.pyindex 03004f61..591a00da 100644--- a/freemocap/webcam/camsetup.py+++ b/freemocap/webcam/camsetup.py@@ -24,7 +24,7 @@ class VideoSetup(threading.Thread):camName = "Camera" + str(self.camID)cv2.namedWindow(camName)- cap = cv2.VideoCapture(self.camID, cv2.CAP_ANY)+ cap = cv2.VideoCapture(self.camID, cv2.CAP_DSHOW)cap.set(cv2.CAP_PROP_FRAME_WIDTH, resWidth)cap.set(cv2.CAP_PROP_FRAME_HEIGHT, resHeight)cap.set(cv2.CAP_PROP_EXPOSURE, exposure)diff --git a/freemocap/webcam/checkcams.py b/freemocap/webcam/checkcams.pyindex 51bacd13..6491a2fa 100644--- a/freemocap/webcam/checkcams.py+++ b/freemocap/webcam/checkcams.py@@ -6,7 +6,7 @@ def TestDevice(source):"""Checks to see if there is a camera available at the input"""- cap = cv2.VideoCapture(source, cv2.CAP_ANY)+ cap = cv2.VideoCapture(source, cv2.CAP_DSHOW)# if cap is None or not cap.isOpened():# print('Warning: unable to open video source: ', source)diff --git a/freemocap/webcam/startcamrecording.py b/freemocap/webcam/startcamrecording.pyindex 98fa4420..a60a6fd5 100644--- a/freemocap/webcam/startcamrecording.py+++ b/freemocap/webcam/startcamrecording.py@@ -50,7 +50,7 @@ def CamRecording(flag = Falsecv2.namedWindow(camID) # name the preview window for the camera its showing- cam = cv2.VideoCapture(camInput, cv2.CAP_ANY) # create the video capture object+ cam = cv2.VideoCapture(camInput, cv2.CAP_DSHOW) # create the video capture object# if not cam.isOpened():# raise RuntimeError('No camera found at input '+ str(camID))# pulling out all the dictionary paramtersdiff --git a/freemocap_runme_script.py b/freemocap_runme_script.pyindex ec3deb8d..28e30b89 100644--- a/freemocap_runme_script.py+++ b/freemocap_runme_script.py@@ -6,13 +6,13 @@ import sysfmc.RunMe(# sessionID = 'sesh_2021-08-29_17_55_45',sessionID=None,- stage = 5,- useOpenPose=True,+ stage = 1,+ useOpenPose=False,runOpenPose=True,- useMediaPipe=False,+ useMediaPipe=True,runMediaPipe = True,useDLC=False,recordVid = True ,- reconstructionConfidenceThreshold = 0.0,- calVideoFrameLength = 60,+ reconstructionConfidenceThreshold = 0.7,+ calVideoFrameLength = -1,)diff --git a/requirements.txt b/requirements.txtindex 915558ef..4dcdb2e2 100644--- a/requirements.txt+++ b/requirements.txt@@ -7,5 +7,7 @@ opencv-contrib-python~=3.4.14.51pandas~=1.2.5rich~=10.4.0tqdm~=4.61.1-ruamel.yaml<0.17-numpy<=1.19\ No newline at end of file+ruamel.yaml>=0.15.0+numpy<=1.19+typed-ast<1.5,>=1.4.0+moviepydiff --git a/setup.py b/setup.pyindex 8272cea1..fa9ffcef 100644--- a/setup.py+++ b/setup.py@@ -65,8 +65,7 @@ setup(install_requires=requirements,extras_require={"dlc": ["tensorflow-gpu>=2.0","tf_slim>=1.1.0",- "deeplabcut>=2.2",- "typed-ast<1.5,>=1.4.0"]},+ "deeplabcut>=2.2",]},license="AGPLv3",classifiers=["Development Status :: 2 - Pre-Alpha",diff --git a/update_pip.txt b/update_pip.txtnew file mode 100644index 00000000..99f6e430--- /dev/null+++ b/update_pip.txt@@ -0,0 +1,10 @@++git commit --allow-empty -m "REL: v0.0.29"+git tag -a v0.0.29 # Don't forget the leading v+git push origin main+git push origin v0.0.29+python3 -m pip install --upgrade wheel+git clean -dfx+python setup.py sdist+python setup.py bdist_wheel+twine upload dist/*\ No newline at end of file