Skip to content

Free Motion Capture for Everyone πŸ’€βœ¨

TypeScript

reorganizing where user preferences are decided

Aaron Cherian489be92492e3
diff --git a/freemocap/fmc_runme.py b/freemocap/fmc_runme.py
index 3f819396..08e60dac 100644
--- a/freemocap/fmc_runme.py
+++ b/freemocap/fmc_runme.py
@@ -37,7 +37,25 @@ def Run(sessionID=None,stage=1,useOpenPose=True,useMediaPipe=False,useDLC=True,d
if sesh.useDLC:
import deeplabcut as dlc
- sesh.dlcConfigPath =dlcConfigPath
+ sesh.dlcConfigPath = dlcConfigPath
+
+
+ #%% load user preferences if they exist, create a new preferences yaml if they don't
+ here = Path(__file__).parent
+ preferences_path = here/'user_preferences.yaml'
+ preferences_yaml = YAML()
+
+ if preferences_path.exists():
+ preferences = preferences_yaml.load(preferences_path)
+ else:
+ preferences = recordingconfig.parameters_for_yaml
+ preferences_yaml.dump(preferences, preferences_path)
+
+ sesh.preferences = preferences
+ sesh.preferences_path = preferences_path
+
+ #if sesh.useDLC:
+
# 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")
if stage > 1:
@@ -51,14 +69,6 @@ def Run(sessionID=None,stage=1,useOpenPose=True,useMediaPipe=False,useDLC=True,d
basePath = runmeGUI.RunChooseDataPathGUI(session)
#sesh.dataFolderPath = Path(basePath)/sesh.dataFolderName
else:
- here = Path(__file__).parent
- preferences_path = here/'user_preferences.yaml'
- preferences_yaml = YAML()
-
- if not preferences_path.exists():
- raise FileNotFoundError('The user preferences yaml could not be located. Please change setDataPath to True to manually set the path to the Data folder')
-
- preferences = preferences_yaml.load(preferences_path)
current_path_to_data = preferences['saved']['path_to_save']
basePath = current_path_to_data
dataFolder = Path(basePath)/sesh.dataFolderName
diff --git a/freemocap/recordingconfig.py b/freemocap/recordingconfig.py
index 3fda9ed2..9cb527f3 100644
--- a/freemocap/recordingconfig.py
+++ b/freemocap/recordingconfig.py
@@ -9,7 +9,7 @@ from pathlib import Path
folder_setup = ['RawVideos','SyncedVideos','CalVideos','DataArrays','DLCData','OpenPoseData','MediaPipeData','imOut']
-default_parameters = {'path_to_save': str(Path.cwd()),'rotations':{},'parameters':{'exposure':-5,'resWidth':640,'resHeight':480,'framerate':25,'codec':'DIVX'}}
+default_parameters = {'path_to_save': str(Path.cwd()),'dlcconfig_paths':[], 'rotations':{},'parameters':{'exposure':-5,'resWidth':640,'resHeight':480,'framerate':25,'codec':'DIVX'}}
saved_parameters = default_parameters
parameters_for_yaml = {'default':default_parameters,'saved':{}}
diff --git a/freemocap/runmeGUI.py b/freemocap/runmeGUI.py
index 3528ca42..508dad38 100644
--- a/freemocap/runmeGUI.py
+++ b/freemocap/runmeGUI.py
@@ -45,6 +45,15 @@ class setDataPathGUI:
self.master.destroy()
+class DLCConfigPathGUI:
+ def __init__(self):
+
+
+ pass
+
+
+
+
def RunChooseDataPathGUI(session):
root = tk.Tk()
chosenDataPath = setDataPathGUI(root, session)
diff --git a/freemocap/session.py b/freemocap/session.py
index 0af37787..abc75d6f 100644
--- a/freemocap/session.py
+++ b/freemocap/session.py
@@ -183,7 +183,10 @@ class Session: #self like "recording self"
self.imOutPath = session_paths['imOut']
self.dataArrayPath = session_paths['DataArrays']
-
+ def save_user_preferences(self,preferences):
+ preferences_yaml = YAML()
+ preferences_yaml.dump(preferences,self.preferences_path)
+
f = 2
diff --git a/freemocap/webcamGUI.py b/freemocap/webcamGUI.py
index 5e1e2061..84b8703c 100644
--- a/freemocap/webcamGUI.py
+++ b/freemocap/webcamGUI.py
@@ -25,26 +25,31 @@ def initialize(session, stage, board):
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/'user_preferences.yaml'
- parameters_yaml = YAML()
- if parameter_path.exists():
- parameters = parameters_yaml.load(parameter_path)
- else:
- parameters = recordingconfig.parameters_for_yaml
- with open(parameter_path,'w') as outfile:
- parameters_yaml.dump(parameters, outfile)
+ #here = Path(__file__).parent
+ # parameter_path = here/'user_preferences.yaml'
+ # parameters_yaml = YAML()
+ # if parameter_path.exists():
+ # parameters = parameters_yaml.load(parameter_path)
+ # else:
+ # parameters = recordingconfig.parameters_for_yaml
+ # with open(parameter_path,'w') as outfile:
+ # parameters_yaml.dump(parameters, outfile)
try:
- rotation_entry = parameters["saved"]["rotations"]
- parameter_entry = parameters["saved"]["parameters"]
- current_path_to_save = parameters['saved']['path_to_save']
+ rotation_entry = session.preferences["saved"]["rotations"]
+ parameter_entry = session.preferences["saved"]["parameters"]
except:
print("Could not load saved parameters, using default parameters")
- rotation_entry = parameters['default']['rotations']
- parameter_entry = parameters['default']['parameters']
- current_path_to_save = parameters['default']['path_to_save']
+ 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
@@ -54,12 +59,13 @@ def initialize(session, stage, board):
#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
+ #recordingconfig.camera_session.preferences['saved'] = paramDict
+ session.preferences['saved']['rotations'] = rotDict
+ session.preferences['saved']['parameters'] = paramDict
if savepath is not None:
- parameters['saved']['path_to_save'] = savepath
- parameters_yaml.dump(parameters, parameter_path)
+ session.preferences['saved']['path_to_save'] = savepath
+
+ session.save_user_preferences(session.preferences)
#save recording parameters to the config yaml
@@ -73,9 +79,8 @@ def initialize(session, stage, board):
proceedToRecording, session.sessionID, savepath = recordGUI.RunProceedtoRecordGUI(
sessionID_in,current_path_to_save
)
- parameters['saved']['path_to_save'] = savepath
- parameters_yaml.dump(parameters, parameter_path)
-
+ session.preferences['saved']['path_to_save'] = savepath
+ session.save_user_preferences(session.preferences)
elif task == "record":
proceedToRecording = True