Free Motion Capture for Everyone πβ¨
TypeScript
pip install -r requirements.txt DOES work?
jon matthisc81edae026c0
diff --git a/.gitignore b/.gitignoreindex 7a1377dd..dfb39d35 100644--- a/.gitignore+++ b/.gitignore@@ -131,12 +131,7 @@ dmypy.json# Pyre type checker.pyre/.vscode/launch.json-<<<<<<< HEAD-Cam4-Cam3-Cam2-Cam1-=======-Cam2-Cam1->>>>>>> 8f1fbc8... runme file reorganization+++# other+src/diff --git a/Cam1 b/Cam1new file mode 100644index 00000000..dd5c959fBinary files /dev/null and b/Cam1 differdiff --git a/Cam2 b/Cam2new file mode 100644index 00000000..85b9f31aBinary files /dev/null and b/Cam2 differdiff --git a/Cam3 b/Cam3new file mode 100644index 00000000..221d9fa2Binary files /dev/null and b/Cam3 differdiff --git a/Cam4 b/Cam4new file mode 100644index 00000000..3e7734e6Binary files /dev/null and b/Cam4 differdiff --git a/freemocap/fmc_anipose.py b/freemocap/fmc_anipose.pyindex a2f6d138..29c319a5 100644--- a/freemocap/fmc_anipose.py+++ b/freemocap/fmc_anipose.py@@ -1,3 +1,7 @@++#NOTE - this is altered version of code from Anipose - We should make this alteration in a forked repo of aniposelib rather than copying the py file and altering it in our repo++import cv2import numpy as npfrom copy import copydiff --git a/freemocap/webcamGUI.py b/freemocap/webcamGUI.pynew file mode 100644index 00000000..753dfe5a--- /dev/null+++ b/freemocap/webcamGUI.py@@ -0,0 +1,287 @@+from pathlib import Path+from ruamel.yaml import YAML+import datetime+import sys+import pandas as pd+import numpy as np++from freemocap.webcam import recordGUI, camsetup+from freemocap import recordingconfig, fmc_anipose+++def initialize(session, stage, board):++ print("Starting initialization for stage {}".format(stage))+ # if stage == 1:+ filepath = Path.cwd()++ session.board = board++ # %% Stage One Initialization+ if stage == 1:++ # create session ID+ sessionID_in = datetime.datetime.now().strftime("sesh_%y-%m-%d_%H%M%S")+ session.sessionID = sessionID_in++ #load the parameters YAML and extract the saved parameters if possible, and the default otherwise+ here = Path(__file__).parent+ parameter_path = here/'parameters.yaml'+ parameters_yaml = YAML()+ parameters = parameters_yaml.load(parameter_path)++ try:+ rotation_entry = parameters["saved"]["rotations"]+ parameter_entry = parameters["saved"]["parameters"]+ except:+ print("Could not load saved parameters, using default parameters")+ rotation_entry = parameters['default']['rotations']+ parameter_entry = parameters['default']['parameters']++ proceedToRecording = False #create this boolean, set it to false, and if the user wants to record+ #later in the pipeline, it will be set to true++ #run the GUI to get the tasks, the cams chosen, the camera settings, and the session ID+ task, cam_inputs, rotDict, paramDict, session.sessionID = recordGUI.RunGUI(sessionID_in,rotation_entry,parameter_entry)++ #update the saved parameters in the YAML+ #recordingconfig.rotation_settings['saved'] = rotDict+ #recordingconfig.camera_parameters['saved'] = paramDict+ parameters['saved']['rotations'] = rotDict+ parameters['saved']['parameters'] = paramDict+ parameters_yaml.dump(parameters, parameter_path)++ #save recording parameters to the config yaml+++ #create a list from the rotation dictionary to be used in running webcams+ rotation_input = list(rotDict.values())++ if task == "setup":+ # run setup processes, and then check if th user wants to proceed to recording+ camsetup.RunSetup(cam_inputs, rotation_input, paramDict)+ proceedToRecording, session.sessionID = recordGUI.RunProceedtoRecordGUI(+ sessionID_in+ )++ elif task == "record":+ proceedToRecording = True++ if proceedToRecording:+ # create these session properties to be used later in the pipeline+ session.cam_inputs = cam_inputs+ session.parameterDictionary = paramDict+ session.rotationInputs = rotation_input++ #create a config yaml and text file for this session+ session.start_session(session.parameterDictionary,session.rotationInputs)+ session.session_settings['recording_parameters']['RotationInputs'] = rotDict+ session.session_settings['recording_parameters']['ParameterDict'] = paramDict+ #configyaml = YAML()+ #sessionsettings = configyaml.load(session.session_yaml_path)+ #sessionsettings['recording_parameters']['RotationInputs'] = rotDict+ #sessionsettings['recording_parameters']['ParameterDict'] = paramDict+ #configyaml.dump(sessionsettings, session.session_yaml_path)+ #print(sessionsettings)+ #config_yaml_path = recordingconfig.createSession(session,filepath)+ #recordingconfig.createSessionTxt(session,paramDict,rotDict)++ print('Proceeding to Stage One')++ else:++ sys.exit('Recording Cancelled')+# %% Stage Two Initalization+ if stage == 2:+ # session.sessionPath = filepath/'Data'/session.sessionID #create a session path based on the sessionID++ # #load the config yaml for this session, and add all the paths to the session file+ # session.yamlPath = session.sessionPath/'{}_config.yaml'.format(session.sessionID)+ # 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.initialize(stage)++ #from the config settings add the camera input parameters to parameter dictionary+ session.parameterDictionary = session.session_settings['recording_parameters']['ParameterDict']+ session.rotationInputs = session.session_settings['recording_parameters']['RotationInputs']++ print("Proceeding to Stage One")++ else:++ sys.exit("Recording Cancelled")+ # %% Stage Two Initalization+ if stage == 2:+ session.sessionPath = (+ filepath / "Data" / session.sessionID+ ) # create a session path based on the sessionID++ # load the config yaml for this session, and add all the paths to the session file+ session.yamlPath = session.sessionPath / "{}_config.yaml".format(+ session.sessionID+ )+ 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 = session.config_settings["CamInputs"][+ "ParameterDict"+ ]+ session.rotationInputs = session.config_settings["CamInputs"]["RotationInputs"]++ # initialize the path to the timestamp csv+ csvName = session.sessionID + ".csv"+ csvPath = session.sessionPath / csvName++ # read CSV data, turn it into a data frame+ timeStampData = pd.read_csv(csvPath)+ timeStampData = timeStampData.iloc[:, 1:]++ # get the camIDs and number of cameras (numCamRange) from the dataframe+ camIDs = list(timeStampData.columns)+ numCams = len(camIDs)+ numCamRange = range(len(camIDs))++ # create names for each of the raw videos+ vidNames = []+ for x in numCamRange:+ singleVidName = "raw_cam{}.mp4".format(x + 1)+ vidNames.append(singleVidName)++ # initialize all the session variables we'll need to run the rest of the pipeline+ session.timeStampData = timeStampData+ session.camIDs = camIDs+ session.numCamRange = numCamRange+ session.vidNames = vidNames+ session.numCams = numCams++ if stage == 3:++ session.sessionPath = (+ filepath / "Data" / session.sessionID+ ) # create a session path based on the sessionID++ # load the config yaml for this session, and add all the paths to the session file+ session.yamlPath = session.sessionPath / "{}_config.yaml".format(+ session.sessionID+ )++ if (+ session.yamlPath.is_file()+ ): # if the config yaml exists (from a webcam recording)+ 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+ else: # if it doesn't exist (because of a GoPro/external camera recording)+ recordingconfig.createSession(session, filepath)++ if stage == 4:++ session.sessionPath = filepath / "Data" / session.sessionID++ session.yamlPath = session.sessionPath / "{}_config.yaml".format(+ session.sessionID+ ) # path to the configuration yaml+ 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 == 6:++ session.sessionPath = filepath / "Data" / session.sessionID++ session.yamlPath = session.sessionPath / "{}_config.yaml".format(+ session.sessionID+ ) # path to the configuration yaml+ 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++ if session.useOpenPose:+ session.openPose_imgPathList = session.config_settings[+ "openPose_imgPathList"+ ]++ if session.useMediaPipe:+ session.mediaPipe_imgPathList = session.config_settings[+ "mediaPipe_imgPathList"+ ]++ # if stage == 5:++ # session.sessionPath = filepath/'Data'/session.sessionID++ # session.yamlPath = session.sessionPath/'{}_config.yaml'.format(session.sessionID) #path to the configuration yaml+ # 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++ # session.mediaPipe_jsonPathList = session.config_settings['mediaPipe_jsonPathList']+ # session.numCams = len(session.mediaPipe_jsonPathList)++ # if stage == 6:++ # session.sessionPath = filepath/'Data'/session.sessionID++ # session.yamlPath = session.sessionPath/'{}_config.yaml'.format(session.sessionID) #path to the configuration yaml+ # 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.mediaPipeData_nCams_nFrames_nImgPts_XY = np.load(session.dataArrayPath/'mediaPipeData_nCams_nFrames_nImgPts_XY.npy')++ if stage == 7:++ session.sessionPath = filepath / "Data" / session.sessionID++ session.yamlPath = session.sessionPath / "{}_config.yaml".format(+ session.sessionID+ ) # path to the configuration yaml+ 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.mediaPipe_imgPathList = session.config_settings["mediaPipe_imgPathList"]+ session.openPose_imgPathList = session.config_settings["openPose_imgPathList"]++ # session.openPose_imgPathList = session.config_settings['openPose_imgPathList']+ # session.numCams = len(session.openPose_imgPathList)++ if stage == 8:++ session.sessionPath = filepath / "Data" / session.sessionID++ session.yamlPath = session.sessionPath / "{}_config.yaml".format(+ session.sessionID+ ) # path to the configuration yaml+ 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/parameters.yaml b/parameters.yamlindex 92b9b5df..c2d109a0 100644--- a/parameters.yaml+++ b/parameters.yaml@@ -21,9 +21,6 @@ default:saved:rotations:0: 90- 1: 270- 2: 90- 3: 270parameters:exposure: -8resWidth: 640