Free Motion Capture for Everyone πβ¨
TypeScript
Pipeline update and bug fixes
Aaron Cherian0da401d44051
diff --git a/freemocap/initialization.py b/freemocap/initialization.pyindex b787b427..ef8cefad 100644--- a/freemocap/initialization.py+++ b/freemocap/initialization.py@@ -78,12 +78,12 @@ def initialize(session, stage, board):#load the config yaml for this session, and add all the paths to the session filesession.yamlPath = session.sessionPath/'{}_config.yaml'.format(session.sessionID)- config_settings = recordingconfig.load_config_yaml(session.yamlPath) #config settings = paths and camera parameter inputs- recordingconfig.load_session_paths(session,config_settings) #add paths to session class+ session.config_settings = recordingconfig.load_config_yaml(session.yamlPath) #config settings = paths and camera parameter inputs+ recordingconfig.load_session_paths(session,session.config_settings) #add paths to session class#from the config settings add the camera input parameters to parameter dictionary- session.parameterDictionary = config_settings['CamInputs']['ParameterDict']- session.rotationInputs = config_settings['CamInputs']['RotationInputs']+ session.parameterDictionary = session.config_settings['CamInputs']['ParameterDict']+ session.rotationInputs = session.config_settings['CamInputs']['RotationInputs']#initialize the path to the timestamp csvcsvName = session.sessionID + '.csv'@@ -95,6 +95,7 @@ def initialize(session, stage, board):#get the camIDs and number of cameras (numCamRange) from the dataframecamIDs = list(timeStampData.columns)+ numCams = len(camIDs)numCamRange = range(len(camIDs))#create names for each of the raw videos@@ -109,6 +110,7 @@ def initialize(session, stage, board):session.camIDs = camIDssession.numCamRange = numCamRangesession.vidNames = vidNames+ session.numCams = numCamsif stage == 3:@@ -118,8 +120,8 @@ def initialize(session, stage, board):session.yamlPath = session.sessionPath/'{}_config.yaml'.format(session.sessionID)if session.yamlPath.is_file(): #if the config yaml exists (from a webcam recording)- config_settings = recordingconfig.load_config_yaml(session.yamlPath) #config settings = paths and camera parameter inputs- recordingconfig.load_session_paths(session,config_settings) #add paths to session class+ session.config_settings = recordingconfig.load_config_yaml(session.yamlPath) #config settings = paths and camera parameter inputs+ recordingconfig.load_session_paths(session,session.config_settings) #add paths to session classelse: #if it doesn't exist (because of a GoPro/external camera recording)recordingconfig.createSession(session,filepath)@@ -128,18 +130,26 @@ def initialize(session, stage, board):session.sessionPath = filepath/'Data'/session.sessionIDsession.yamlPath = session.sessionPath/'{}_config.yaml'.format(session.sessionID) #path to the configuration yaml- config_settings = recordingconfig.load_config_yaml(session.yamlPath) #config settings = paths and camera parameter inputs- recordingconfig.load_session_paths(session,config_settings) #add paths to session class+ session.config_settings = recordingconfig.load_config_yaml(session.yamlPath) #config settings = paths and camera parameter inputs+ recordingconfig.load_session_paths(session,session.config_settings) #add paths to session class++ for count,thisVidPath in enumerate(session.syncedVidPath.glob('*.mp4'),start=1):+ session.numCams = count++if stage == 5:session.sessionPath = filepath/'Data'/session.sessionIDsession.yamlPath = session.sessionPath/'{}_config.yaml'.format(session.sessionID) #path to the configuration yaml- config_settings = recordingconfig.load_config_yaml(session.yamlPath) #config settings = paths and camera parameter inputs- recordingconfig.load_session_paths(session,config_settings) #add paths to session class+ session.config_settings = recordingconfig.load_config_yaml(session.yamlPath) #config settings = paths and camera parameter inputs+ recordingconfig.load_session_paths(session,session.config_settings) #add paths to session class- session.openPose_jsonPathList = config_settings['openPose_jsonPathList']+ for count,thisVidPath in enumerate(session.syncedVidPath.glob('*.mp4'),start=1):+ session.numCams = count++ session.openPose_jsonPathList = session.config_settings['openPose_jsonPathList']session.numCams = len(session.openPose_jsonPathList)if stage == 6:@@ -147,23 +157,21 @@ def initialize(session, stage, board):session.sessionPath = filepath/'Data'/session.sessionIDsession.yamlPath = session.sessionPath/'{}_config.yaml'.format(session.sessionID) #path to the configuration yaml- config_settings = recordingconfig.load_config_yaml(session.yamlPath) #config settings = paths and camera parameter inputs- recordingconfig.load_session_paths(session,config_settings) #add paths to session class+ session.config_settings = recordingconfig.load_config_yaml(session.yamlPath) #config settings = paths and camera parameter inputs+ recordingconfig.load_session_paths(session,session.config_settings) #add paths to session classsession.openPoseData_nCams_nFrames_nImgPts_XY = np.load(session.dataArrayPath/'openPoseData_nCams_nFrames_nImgPts_XY.npy')- calibrationFile = '{}_calibration.yaml'.format(session.sessionID)- session.cameraConfigFilePath = session.sessionPath/calibrationFile- session.cgroup = stolenfromanipose.CameraGroup.load(session.cameraConfigFilePath)+if stage == 7:session.sessionPath = filepath/'Data'/session.sessionIDsession.yamlPath = session.sessionPath/'{}_config.yaml'.format(session.sessionID) #path to the configuration yaml- config_settings = recordingconfig.load_config_yaml(session.yamlPath) #config settings = paths and camera parameter inputs- recordingconfig.load_session_paths(session,config_settings) #add paths to session class+ session.config_settings = recordingconfig.load_config_yaml(session.yamlPath) #config settings = paths and camera parameter inputs+ recordingconfig.load_session_paths(session,session.config_settings) #add paths to session class- session.openPose_imgPathList = config_settings['openPose_imgPathList']+ session.openPose_imgPathList = session.config_settings['openPose_imgPathList']session.numCams = len(session.openPose_imgPathList)session.mean_charuco_fr_mar_dim = np.load(session.dataArrayPath/'charuco_points.npy')@@ -174,7 +182,7 @@ def initialize(session, stage, board):session.sessionPath = filepath/'Data'/session.sessionIDsession.yamlPath = session.sessionPath/'{}_config.yaml'.format(session.sessionID) #path to the configuration yaml- config_settings = recordingconfig.load_config_yaml(session.yamlPath) #config settings = paths and camera parameter inputs- recordingconfig.load_session_paths(session,config_settings) #add paths to session class+ session.config_settings = recordingconfig.load_config_yaml(session.yamlPath) #config settings = paths and camera parameter inputs+ recordingconfig.load_session_paths(session,session.config_settings) #add paths to session class# %%diff --git a/freemocap/playskeleton.py b/freemocap/playskeleton.pyindex 757aef3b..4723cf1a 100644--- a/freemocap/playskeleton.py+++ b/freemocap/playskeleton.py@@ -144,7 +144,19 @@ from pathlib import Pathdef ReplaySkeleton(session, vidType, startframe,azimuth,elevation):++ if session.mean_charuco_fr_mar_dim is None:+ session.mean_charuco_fr_mar_dim = np.load(session.dataArrayPath/'charuco_points.npy')++ if session.skel_fr_mar_dim is None:+ session.skel_fr_mar_dim = np.load(session.dataArrayPath/'skeleton_points.npy')+camImgPathList = {}++ if session.openPose_imgPathList is None:+ session.openPose_imgPathList = session.config_settings['openPose_imgPathList']+ session.numCams = len(session.openPose_imgPathList)+for cam in range(session.numCams):camImgPathList[cam] = list(sorted(Path(session.openPose_imgPathList[cam]).glob('*.png')))session.numFrames = len(camImgPathList[cam]) #will need to perhaps put a check in on whether numFrames between cameras are the samediff --git a/freemocap/reconstruct3D.py b/freemocap/reconstruct3D.pyindex a1a79142..cc45155e 100644--- a/freemocap/reconstruct3D.py+++ b/freemocap/reconstruct3D.py@@ -1,4 +1,12 @@+from freemocap import stolenfromanipose+def reconstruct3D(session, data_nCams_nFrames_nImgPts_XY,data_params):++ if session.cgroup is None: #load the calibration settings into the session class if it hasn't been already+ calibrationFile = '{}_calibration.yaml'.format(session.sessionID)+ session.cameraConfigFilePath = session.sessionPath/calibrationFile+ session.cgroup = stolenfromanipose.CameraGroup.load(session.cameraConfigFilePath)+n_cams, n_frames, n_trackedPoints = data_params#assert numDims == 2, 'Problem with your data! Not enough dimensions'diff --git a/freemocap/session.py b/freemocap/session.pyindex a0ab3501..1af9564b 100644--- a/freemocap/session.py+++ b/freemocap/session.py@@ -12,5 +12,10 @@ class Session: #session like "recording session"self.cam_inputs = Noneself.parameterDictionary = Noneself.rotationInputs = None++ self.cgroup = None-\ No newline at end of file+ self.mean_charuco_fr_mar_dim = None+ self.skel_fr_mar_dim = None++ self.openPose_imgPathList = None\ No newline at end of filediff --git a/runme_fmc_staged.py b/runme_fmc_staged.pyindex 0c808575..b01367bd 100644--- a/runme_fmc_staged.py+++ b/runme_fmc_staged.py@@ -1,5 +1,7 @@from freemocap import createvideo, initialization, runcams, calibrate, runopenpose, reconstruct3D, playskeleton, session+from pathlib import Path+import osfrom aniposelib.boards import CharucoBoard, Checkerboard@@ -10,9 +12,14 @@ import numpy as npsesh = session.Session(useOpenPose=True,useDLC=False)# %% Inputs to edit-stage = 1 #set your starting stage here (stage = 1 will run the pipeline from webcams)+stage = 8 #set your starting stage here (stage = 1 will run the pipeline from webcams)sesh.debug = True-sesh.sessionID = '' #fill in if you are running from Stage 2 onwards++sesh.sessionID = '' #fill in if you are running from Stage 2 onwards+if not sesh.sessionID:+ dataFolder = Path.cwd()/'Data'+ 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 subfoldersboard = 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`)@@ -33,6 +40,8 @@ initialization.initialize(sesh,stage,board)# %% Stage Oneif not stage > 1:+ print()+ print('Starting Video Recordings')runcams.RecordCams(sesh, sesh.cam_inputs, sesh.parameterDictionary, sesh.rotationInputs)else:print('Skipping Video Recording')@@ -40,30 +49,40 @@ else:# %% Stage Twoif not stage > 2:+ print()+ print('Starting Video Syncing')runcams.SyncCams(sesh, sesh.timeStampData,sesh.numCamRange,sesh.vidNames,sesh.camIDs)else:print('Skipping Video Syncing')# %% Stage Threeif not stage > 3:+ print()+ print('Starting Calibration')sesh.cgroup, sesh.mean_charuco_fr_mar_dim = calibrate.CalibrateCaptureVolume(sesh,board)else:print('Skipping Calibration')# %% Stage Fourif not stage > 4:+ print()+ print('Starting Running OpenPose')runopenpose.runOpenPose(sesh)else:print('Skipping Running OpenPose')# %% Stage Fiveif not stage > 5:+ print()+ print('Starting Parse OpenPose')sesh.openPoseData_nCams_nFrames_nImgPts_XY = runopenpose.parseOpenPose(sesh)else:print('Skipping Parse OpenPose')# %% Stage Sixif not stage > 6:+ print()+ print('Starting Skeleton Reconstruction')openPose_params = sesh.openPoseData_nCams_nFrames_nImgPts_XY.shape[0:3]sesh.skel_fr_mar_dim = reconstruct3D.reconstruct3D(sesh,sesh.openPoseData_nCams_nFrames_nImgPts_XY, openPose_params)@@ -74,12 +93,16 @@ else:# %% Stage Sevenif not stage > 7:+ print()+ print('Starting Skeleton Plotting')playskeleton.ReplaySkeleton(sesh,1,40,-90,-75)else:print('Skipping Skeleton Plotting')# %% Stage Eightif not stage > 8:+ print()+ print('Starting Video Creation')createvideo.createVideo(sesh)else:print('Skipping Video Creation')