Free Motion Capture for Everyone πβ¨
TypeScript
buttons!
aaroncherian7a545d236325
diff --git a/freemocap/webcam/recordGUI.py b/freemocap/webcam/recordGUI.pyindex f0ca86f3..3fb5a2c4 100644--- a/freemocap/webcam/recordGUI.py+++ b/freemocap/webcam/recordGUI.py@@ -17,6 +17,7 @@ class recordGUI:# a listbox, and allows you to pick a task for the camerasdef __init__(self, master):self.master = master+ self.refresh = False# Detect how many inputs you have availableavailable_inputs = checkcams.CreateAvailableCamList()number_of_cams = len(available_inputs)@@ -61,14 +62,23 @@ class recordGUI:self.sub_button = Button(bottom_frame, text="Submit", command=self.Submit)self.sub_button.pack(side=tk.RIGHT)+ self.refresh_button = Button(bottom_frame, text="Refresh", command=self.Refresh)+ self.refresh_button.pack(side=tk.RIGHT)+def Submit(self):self.taskChoice = self.currentTask.get()self.selected = [int(self.list_box.get(pos)) for pos in self.list_box.curselection()]+ self.refresh = False+ self.master.destroy()++ def Refresh(self):+ self.refresh = Trueself.master.destroy()+class SettingsGUI:def __init__(self,@@ -245,6 +255,7 @@ class SettingsGUI:class ProceedToRecordGUI:def __init__(self, master, sessionID_in, current_path_to_save):self.master = master+ self.restart_setup = Falseself.sessionID_in = sessionID_inself.continueToRecording = ""self.sessionID_out = ""@@ -274,8 +285,10 @@ class ProceedToRecordGUI:# master.title("Proceed to Recording?")self.proceed_button = Button(text="Proceed", command=self.proceed)+ self.change_button = Button(text = "Change Parameters", command = self.change_params)self.stop_button = Button(text="Quit", command=self.stop)self.stop_button.pack(side=tk.RIGHT)+ self.change_button.pack(side = tk.LEFT)self.proceed_button.pack(side=tk.RIGHT)@@ -289,6 +302,13 @@ class ProceedToRecordGUI:def stop(self):self.master.destroy()+ def change_params(self):+ self.restart_setup = True+ self.sessionID_out = self.sessionIDEntry.get()+ self.save_path = self.currentPath+ self.master.destroy()++def proceed(self):self.continueToRecording = Trueself.sessionID_out = self.sessionIDEntry.get()@@ -296,18 +316,26 @@ class ProceedToRecordGUI:self.master.destroy()-def RunGUI(sessionID_in, rotation_entry, parameter_entry,current_path_to_save):++def RunChoiceGUI():# ---Get the camera inputs and the task- root = tk.Tk()- camera_choice = recordGUI(root)- root.mainloop()+ refresh = True+ while refresh:+ root = tk.Tk()+ camera_choice = recordGUI(root)+ root.mainloop()+ refresh = camera_choice.refreshcam_inputs = camera_choice.selectedif not cam_inputs:raise ValueError("No camera inputs selected")task = camera_choice.taskChoice+ return cam_inputs,task+++def RunParametersGUI(sessionID_in, rotation_entry, parameter_entry,current_path_to_save,cam_inputs,task):# ---Get all the necessary parametersroot = tk.Tk()recording_settings = SettingsGUI(@@ -327,7 +355,7 @@ def RunGUI(sessionID_in, rotation_entry, parameter_entry,current_path_to_save):sessionID = Nonesavepath = None- return task, cam_inputs, recording_settings.rotation_output, paramDict, sessionID,savepath+ return recording_settings.rotation_output, paramDict, sessionID,savepathdef RunProceedtoRecordGUI(sessionID_in,current_path_to_save):@@ -335,4 +363,4 @@ def RunProceedtoRecordGUI(sessionID_in,current_path_to_save):goToRecording = ProceedToRecordGUI(root, sessionID_in,current_path_to_save)root.mainloop()- return goToRecording.continueToRecording, goToRecording.sessionID_out, goToRecording.save_path+ return goToRecording.continueToRecording, goToRecording.restart_setup,goToRecording.sessionID_out, goToRecording.save_pathdiff --git a/freemocap/webcamGUI.py b/freemocap/webcamGUI.pyindex 4a71a63d..554008b7 100644--- a/freemocap/webcamGUI.py+++ b/freemocap/webcamGUI.py@@ -46,53 +46,58 @@ def initialize(session, stage, board):# parameters_yaml.dump(parameters, outfile)- try:- rotation_entry = session.preferences["saved"]["rotations"]- parameter_entry = session.preferences["saved"]["parameters"]- except:- print("Could not load saved parameters, using default parameters")- rotation_entry = session.preferences['default']['rotations']- parameter_entry = session.preferences['default']['parameters']--- try:- current_path_to_save = session.preferences['saved']['path_to_save']- except:- current_path_to_save = session.preferences['default']['path_to_save']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,savepath = recordGUI.RunGUI(sessionID_in,rotation_entry,parameter_entry,current_path_to_save)-- #update the saved parameters in the YAML- #recordingconfig.rotation_settings['saved'] = rotDict- #recordingconfig.camera_session.preferences['saved'] = paramDict- session.preferences['saved']['rotations'] = rotDict- session.preferences['saved']['parameters'] = paramDict- if savepath is not None:- session.preferences['saved']['path_to_save'] = savepath-- session.save_user_preferences(session.preferences)-- #save recording parameters to the config yaml+ cam_inputs, task = recordGUI.RunChoiceGUI()+ restartSetup = True+ while restartSetup == True:++ try:+ rotation_entry = session.preferences["saved"]["rotations"]+ parameter_entry = session.preferences["saved"]["parameters"]+ except:+ print("Could not load saved parameters, using default parameters")+ rotation_entry = session.preferences['default']['rotations']+ parameter_entry = session.preferences['default']['parameters']+++ try:+ current_path_to_save = session.preferences['saved']['path_to_save']+ except:+ current_path_to_save = session.preferences['default']['path_to_save']+ rotDict, paramDict, session.sessionID,savepath = recordGUI.RunParametersGUI(sessionID_in, rotation_entry, parameter_entry, current_path_to_save, cam_inputs, task)- #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, savepath = recordGUI.RunProceedtoRecordGUI(- sessionID_in,current_path_to_save- )- session.preferences['saved']['path_to_save'] = savepath+ #update the saved parameters in the YAML+ #recordingconfig.rotation_settings['saved'] = rotDict+ #recordingconfig.camera_session.preferences['saved'] = paramDict+ session.preferences['saved']['rotations'] = rotDict+ session.preferences['saved']['parameters'] = paramDict+ if savepath is not None:+ session.preferences['saved']['path_to_save'] = savepath+session.save_user_preferences(session.preferences)- elif task == "record":- proceedToRecording = True++ #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, restartSetup, session.sessionID, savepath = recordGUI.RunProceedtoRecordGUI(+ sessionID_in,current_path_to_save+ )+ session.preferences['saved']['path_to_save'] = savepath+ session.save_user_preferences(session.preferences)+ elif task == "record":+ proceedToRecording = Trueif proceedToRecording:# create these session properties to be used later in the pipelinediff --git a/runme_FreeMoCap.py b/runme_FreeMoCap.pyindex 837e0334..2b051299 100644--- a/runme_FreeMoCap.py+++ b/runme_FreeMoCap.py@@ -1,3 +1,3 @@import freemocap as fmc-fmc.RunMe()\ No newline at end of file+fmc.RunMe(useOpenPose = False, useMediaPipe=True)\ No newline at end of file