Free Motion Capture for Everyone πβ¨
TypeScript
pip install works!
jon matthisd2d8167d169e
diff --git a/README.rst b/README.rstindex 8ff6260a..67793705 100644--- a/README.rst+++ b/README.rst@@ -11,9 +11,8 @@ Your Project NamePython package for doing science.-* Free software: 3-clause BSD license-* Documentation: (COMING SOON!) https://.github.io/your-project-name.-+* Free software: Aferro GNU Public License v3 (AGPLv3)+* Documentation: (COMING SOON!) https://.github.io/freemocapFeatures--------diff --git a/freemocap/__init__.py b/freemocap/__init__.pyindex 80edaf05..4ae2bb15 100644--- a/freemocap/__init__.py+++ b/freemocap/__init__.py@@ -2,3 +2,246 @@ from ._version import get_versions__version__ = get_versions()["version"]del get_versions+++++from freemocap import (+ createvideo,+ initialization,+ recordingconfig,+ runcams,+ calibrate,+ fmc_mediapipe,+ fmc_openpose,+ fmc_deeplabcut,+ reconstruct3D,+ playskeleton,+ session,+ webcamGUI+)+from freemocap.fmc_pyqtgraph import PlayerDockedWindow++from pathlib import Path+import os++from aniposelib.boards import CharucoBoard++import numpy as np++def runme():+ sesh = session.Session()+++ sesh.useOpenPose = True+ sesh.useMediaPipe = False+ sesh.useDLC = False++ if sesh.useDLC:+ import deeplabcut as dlc++ # sesh.dlcConfigPath = Path("C:\\Users\\jonma\\Dropbox\\GitKrakenRepos\\freemocap\\DLC_Models\\PinkGreenRedJugglingBalls-JSM-2021-05-31\\config.yaml")+ sesh.dlcConfigPath = Path(+ "C:\\Users\\jonma\\Desktop\\freemocap\\DLC_Models\\PinkGreenRedJugglingBalls-JSM-2021-05-31\\config.yaml",+ )+++ # %% Inputs to edit+ stage = 1 # set your starting stage here (stage = 1 will run the pipeline from webcams)+ sesh.debug = False++ sesh.sessionID = (+ "" # fill in if you are running from Stage 2 onwards+ )++ if not sesh.sessionID:+ dataFolder = Path.cwd() / "FreeMoCap_Data"++ if dataFolder.exists():+ subfolders = [+ f.path for f in os.scandir(dataFolder) if f.is_dir()+ ] # copy-pasta from who knows where+ sesh.sessionID = Path(+ subfolders[-1]+ ).stem # grab the name of the last folder in the list of subfolders+ else: #First time run! Make 'FreeMoCap_Data' Folder (and eventually, prompt to download sample data)+ dataFolder.mkdir()+ sampleDataFolder = dataFolder / '_sample_data_folder'+ sampleDataFolder.mkdir()++ board = CharucoBoard(+ 7,+ 5,+ # square_length=1, # here, in mm but any unit works (JSM NOTE - just using '1' so resulting units will be in 'charuco squarelenghts`)+ # marker_length=.8,+ # square_length = 121, #big boi charuco+ # marker_length = 98,+ square_length=82, # regular boi charuco+ marker_length=65,+ marker_bits=4,+ dict_size=250,+ ) #someday - need alter this code so that the 'squaresx' and 'squaresy' inputs are keyword arguments++++ # %% Initialization+ #sesh.initialize(stage)+ if stage ==2 or stage == 1:+ webcamGUI.initialize(sesh,stage,board)+ else:+ sesh.initialize(stage)+ # %% Stage One+ if stage <= 1:+ print()+ print("Starting Video Recordings")+ runcams.RecordCams(+ sesh, sesh.cam_inputs, sesh.parameterDictionary, sesh.rotationInputs+ )+ else:+ print("Skipping Video Recording")+++ # %% Stage Two+ if stage <= 2:+ print()+ print("Starting Video Syncing")+ runcams.SyncCams(+ sesh, sesh.timeStampData, sesh.numCamRange, sesh.vidNames, sesh.camIDs+ )+ else:+ print("Skipping Video Syncing")++ # %% Stage Three+ if stage <= 3:+ print()+ print("Starting Calibration")+ sesh.cgroup, sesh.mean_charuco_fr_mar_dim = calibrate.CalibrateCaptureVolume(+ sesh, board+ )+ else:+ print("Skipping Calibration")++ # %% Stage Four+ if stage <= 4:+ print("Starting Track Image Points")+ if sesh.useMediaPipe:+ fmc_mediapipe.runMediaPipe(sesh)+ sesh.mediaPipeData_nCams_nFrames_nImgPts_XYC = fmc_mediapipe.parseMediaPipe(+ sesh+ )+ sesh.mediaPipeSkel_fr_mar_dim = reconstruct3D.reconstruct3D(+ sesh, sesh.mediaPipeData_nCams_nFrames_nImgPts_XYC, confidenceThreshold=0.1+ )+ np.save(+ sesh.dataArrayPath / "mediaPipeSkel_3d.npy", sesh.mediaPipeSkel_fr_mar_dim+ ) # save data to npy++ if sesh.useOpenPose:+ fmc_openpose.runOpenPose(sesh, dummyRun=False)+ sesh.openPoseData_nCams_nFrames_nImgPts_XYC = fmc_openpose.parseOpenPose(sesh)+ sesh.openPoseSkel_fr_mar_dim = reconstruct3D.reconstruct3D(+ sesh, sesh.openPoseData_nCams_nFrames_nImgPts_XYC, confidenceThreshold=0.1+ )+ np.save(+ sesh.dataArrayPath / "openPoseSkel_3d.npy", sesh.openPoseSkel_fr_mar_dim+ ) # save data to npy++ sesh.syncedVidList = []+ if sesh.useDLC:+ for vid in sesh.syncedVidPath.glob("*.mp4"):+ sesh.syncedVidList.append(str(vid))++ dlc.analyze_videos(+ sesh.dlcConfigPath,+ sesh.syncedVidList,+ destfolder=sesh.dlcDataPath,+ save_as_csv=True,+ )++ sesh.dlcData_nCams_nFrames_nImgPts_XYC = fmc_deeplabcut.parseDeepLabCut(sesh)+ sesh.dlc_fr_mar_dim = reconstruct3D.reconstruct3D(+ sesh, sesh.dlcData_nCams_nFrames_nImgPts_XYC, confidenceThreshold=0.95+ )+ np.save(+ sesh.dataArrayPath / "deepLabCut_3d.npy", sesh.dlc_fr_mar_dim+ ) # save data to npy++ else:+ print("Skipping Run MediaPipe")++ # # %% Stage Five+ # if not stage > 5:+ # print('Starting Parse MediaPipe')+ # sesh.mediaPipeData_nCams_nFrames_nImgPts_XYC = fmc_mediapipe.parseMediaPipe(sesh)+ # else:+ # print('Skipping Parse MediaPipe')+++ # # %% Stage Six+ # if not stage > 6:+ # print()+ # print('Starting Skeleton Reconstruction')+ # sesh.skel_fr_mar_dim = reconstruct3D.reconstruct3D(sesh,sesh.mediaPipeData_nCams_nFrames_nImgPts_XYC, confidenceThreshold=.1)++ # path_to_skel_points = sesh.dataArrayPath/'skeleton_points.npy'+ # np.save(path_to_skel_points, sesh.skel_fr_mar_dim)+ # else:+ # print('Skipping Skeleton Reconstruction')+++ # reupdate the config_settings with mediapipe and openpose image paths+ sesh.config_settings = recordingconfig.load_config_yaml(sesh.yamlPath)+++ # %% Stage Six+ if stage <= 6:+ print("Starting PyQT Animation")+ # createvideo.createBodyTrackingVideos(sesh)+ displayVid = 1+ # if displayVid = 0, will show the synced videos+ # if displayVid = 1, will show the openPosed videos+ playWin = PlayerDockedWindow(sesh, displayVid)+ playWin.animate()++ # %% Stage Seven+ if stage <= 7:+ print("Starting Skeleton Plotting")+ playskeleton.ReplaySkeleton_matplotlib(+ sesh,+ vidType=1,+ startFrame=40,+ azimuth=-90,+ elevation=-80,+ useOpenPose=sesh.useOpenPose,+ useMediaPipe=sesh.useMediaPipe,+ useDLC=sesh.useDLC,+ )+ # fmc_pyqtgraph.PlaySkeleton(+ # sesh,+ # vidType=1,+ # startFrame=40,+ # azimuth=-90,+ # elevation=-80,+ # useOpenPose=useOpenPose,+ # useMediaPipe=useMediaPipe,+ # useDLC=useDLC)++ # playSkel = PlaySkeleton(sesh)+ # playSkel.animate()+ # playWin =PlayerDockedWindow(sesh)+ # playWin.animate()++ else:+ print("Skipping Skeleton Plotting")+++ # %% Stage Eight+ if stage <= 8:+ print()+ print("Starting Video Creation")+ createvideo.createVideo(sesh)+ else:+ print("Skipping Video Creation")+++ f = 9diff --git a/freemocap/parameters.yaml b/freemocap/parameters.yamlindex e91f239e..387816ea 100644--- a/freemocap/parameters.yaml+++ b/freemocap/parameters.yaml@@ -20,12 +20,12 @@ default:saved:rotations:- 1: 0- 2: 0- 3: 0- 4: 0+ 1: 90+ 2: 90+ 3: 90+ 4: 90parameters:- exposure: -6+ exposure: -8resWidth: 640resHeight: 480framerate: 30diff --git a/requirements.txt b/requirements.txtindex 4b23d388..06fb68a4 100644--- a/requirements.txt+++ b/requirements.txt@@ -10,10 +10,10 @@ rich~=10.4.0scipy~=1.7.0toml~=0.10.2tqdm~=4.61.1-tensorflow-gpu~=2.0-pyqt5~=5.15.4-pyopengl~=3.1.5-tf_slim~=1.1.0-deeplabcut[gui]~=2.2rc3+tensorflow-gpu>=2.0+pyqt5>=5.15.4+pyopengl>=3.1.5+tf_slim>=1.1.0+deeplabcut[gui]>=2.2rc3ruamel.yaml>=0.15.0typed-ast<1.5,>=1.4.0\ No newline at end of filediff --git a/runme_FreeMoCap.py b/runme_FreeMoCap.pyindex da60cd14..d869f7c5 100644--- a/runme_FreeMoCap.py+++ b/runme_FreeMoCap.py@@ -57,7 +57,8 @@ if not sesh.sessionID:).stem # grab the name of the last folder in the list of subfolderselse: #First time run! Make 'FreeMoCap_Data' Folder (and eventually, prompt to download sample data)dataFolder.mkdir()-+ sampleDataFolder = dataFolder / '_sample_data_folder'+ sampleDataFolder.mkdir()board = CharucoBoard(7,