Skip to content

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

TypeScript

PYQT mediapipe fixes

Aaron Cherian86310c6c78c8
diff --git a/freemocap/fmc_pyqtgraph.py b/freemocap/fmc_pyqtgraph.py
index 32cadfa0..a544cc77 100644
--- a/freemocap/fmc_pyqtgraph.py
+++ b/freemocap/fmc_pyqtgraph.py
@@ -33,139 +33,149 @@ class PlaySkeletonWidget:
self.Skel3dViewWidget.addItem(self.skelScatterItem)
- # make skeleton line plots (numbers specify what order to connects the dots)
- self.head = [17, 15, 0, 1, 0, 16, 18]
- self.spine = [1, 8]
- self.rArm = [17, 15, 0, 16, 18]
- self.rArm = [4, 3, 2, 1]
- self.lArm = [1, 5, 6, 7]
- self.rLeg = [11, 10, 9, 8]
- self.lLeg = [14, 13, 12, 8]
- self.rFoot = [11, 23, 22, 11, 24]
- self.lFoot = [14, 20, 19, 14, 21]
-
- # Make some handy maps ;D
- rHandIDstart = 25
- lHandIDstart = rHandIDstart + 21
-
- self.rHand = (
- np.array(
- [
- 0,
- 1,
- 2,
- 3,
- 4,
- False,
- 0,
- 5,
- 6,
- 7,
- 8,
- False,
- 0,
- 9,
- 10,
- 11,
- 12,
- False,
- 0,
- 13,
- 14,
- 15,
- 16,
- False,
- 0,
- 17,
- 18,
- 19,
- 20,
- ]
- )
- + rHandIDstart
- )
- self.lHand = self.rHand + lHandIDstart
-
- self.headLineItem = gl.GLLinePlotItem(
- pos=self.skel_fr_mar_dim[:, self.head, :],
- color=(1, 1, 1, 0.2),
- width=4.0,
- antialias=True,
- )
- self.Skel3dViewWidget.addItem(self.headLineItem)
-
- self.spineLineItem = gl.GLLinePlotItem(
- pos=self.skel_fr_mar_dim[:, self.spine, :],
- color=(1, 1, 1, 0.9),
- width=4.0,
- antialias=True,
- )
- self.Skel3dViewWidget.addItem(self.spineLineItem)
-
- self.rArmLineItem = gl.GLLinePlotItem(
- pos=self.skel_fr_mar_dim[:, self.rArm, :],
- color=(1, 0.2, 0.15, 0.9),
- width=4.0,
- antialias=True,
- )
- self.Skel3dViewWidget.addItem(self.rArmLineItem)
-
- self.lArmLineItem = gl.GLLinePlotItem(
- pos=self.skel_fr_mar_dim[:, self.lArm, :],
- color=(0.4, 0.6, 1, 0.9),
- width=4.0,
- antialias=True,
- )
- self.Skel3dViewWidget.addItem(self.lArmLineItem)
-
- self.rLegLineItem = gl.GLLinePlotItem(
- pos=self.skel_fr_mar_dim[:, self.rLeg, :],
- color=(1, 0.2, 0.15, 0.9),
- width=4.0,
- antialias=True,
- )
- self.Skel3dViewWidget.addItem(self.rLegLineItem)
-
- self.lLegLineItem = gl.GLLinePlotItem(
- pos=self.skel_fr_mar_dim[:, self.lLeg, :],
- color=(0.4, 0.6, 1, 0.9),
- width=4.0,
- antialias=True,
- )
- self.Skel3dViewWidget.addItem(self.lLegLineItem)
-
- self.rFootLineItem = gl.GLLinePlotItem(
- pos=self.skel_fr_mar_dim[:, self.rFoot, :],
- color=(1, 0.2, 0.15, 0.9),
- width=4.0,
- antialias=True,
+ elif session.useMediaPipe:
+ self.skel_fr_mar_dim = np.load(
+ session.dataArrayPath / "mediaPipeSkel_3d.npy"
)
- self.Skel3dViewWidget.addItem(self.rFootLineItem)
-
- self.lFootLineItem = gl.GLLinePlotItem(
- pos=self.skel_fr_mar_dim[:, self.lFoot, :],
- color=(0.4, 0.6, 1, 0.9),
- width=4.0,
- antialias=True,
+ self.skelScatterItem = gl.GLScatterPlotItem(
+ pos=self.skel_fr_mar_dim, color=(1, 0, 1, 0.8), size=10, pxMode=False
)
- self.Skel3dViewWidget.addItem(self.lFootLineItem)
- # plot handybois
- self.rHandLineItem = gl.GLLinePlotItem(
- pos=self.skel_fr_mar_dim[:, self.rHand, :],
- color=(0.2, 0.4, 1, 0.9),
- width=1.0,
- antialias=True,
- )
- # self.Skel3dViewWidget.addItem(self.rHandLineItem)
+ self.Skel3dViewWidget.addItem(self.skelScatterItem)
- self.lHandLineItem = gl.GLLinePlotItem(
- pos=self.skel_fr_mar_dim[:, self.lHand, :],
- color=(1, 0.1, 0.05, 0.9),
- width=1.0,
- antialias=True,
- )
- # self.Skel3dViewWidget.addItem(self.lHandLineItem)
+ # make skeleton line plots (numbers specify what order to connects the dots)
+ # self.head = [17, 15, 0, 1, 0, 16, 18]
+ # self.spine = [1, 8]
+ # self.rArm = [17, 15, 0, 16, 18]
+ # self.rArm = [4, 3, 2, 1]
+ # self.lArm = [1, 5, 6, 7]
+ # self.rLeg = [11, 10, 9, 8]
+ # self.lLeg = [14, 13, 12, 8]
+ # self.rFoot = [11, 23, 22, 11, 24]
+ # self.lFoot = [14, 20, 19, 14, 21]
+
+ # # Make some handy maps ;D
+ # rHandIDstart = 25
+ # lHandIDstart = rHandIDstart + 21
+
+ # self.rHand = (
+ # np.array(
+ # [
+ # 0,
+ # 1,
+ # 2,
+ # 3,
+ # 4,
+ # False,
+ # 0,
+ # 5,
+ # 6,
+ # 7,
+ # 8,
+ # False,
+ # 0,
+ # 9,
+ # 10,
+ # 11,
+ # 12,
+ # False,
+ # 0,
+ # 13,
+ # 14,
+ # 15,
+ # 16,
+ # False,
+ # 0,
+ # 17,
+ # 18,
+ # 19,
+ # 20,
+ # ]
+ # )
+ # + rHandIDstart
+ # )
+ # self.lHand = self.rHand + lHandIDstart
+
+ # self.headLineItem = gl.GLLinePlotItem(
+ # pos=self.skel_fr_mar_dim[:, self.head, :],
+ # color=(1, 1, 1, 0.2),
+ # width=4.0,
+ # antialias=True,
+ # )
+ # self.Skel3dViewWidget.addItem(self.headLineItem)
+
+ # self.spineLineItem = gl.GLLinePlotItem(
+ # pos=self.skel_fr_mar_dim[:, self.spine, :],
+ # color=(1, 1, 1, 0.9),
+ # width=4.0,
+ # antialias=True,
+ # )
+ # self.Skel3dViewWidget.addItem(self.spineLineItem)
+
+ # self.rArmLineItem = gl.GLLinePlotItem(
+ # pos=self.skel_fr_mar_dim[:, self.rArm, :],
+ # color=(1, 0.2, 0.15, 0.9),
+ # width=4.0,
+ # antialias=True,
+ # )
+ # self.Skel3dViewWidget.addItem(self.rArmLineItem)
+
+ # self.lArmLineItem = gl.GLLinePlotItem(
+ # pos=self.skel_fr_mar_dim[:, self.lArm, :],
+ # color=(0.4, 0.6, 1, 0.9),
+ # width=4.0,
+ # antialias=True,
+ # )
+ # self.Skel3dViewWidget.addItem(self.lArmLineItem)
+
+ # self.rLegLineItem = gl.GLLinePlotItem(
+ # pos=self.skel_fr_mar_dim[:, self.rLeg, :],
+ # color=(1, 0.2, 0.15, 0.9),
+ # width=4.0,
+ # antialias=True,
+ # )
+ # self.Skel3dViewWidget.addItem(self.rLegLineItem)
+
+ # self.lLegLineItem = gl.GLLinePlotItem(
+ # pos=self.skel_fr_mar_dim[:, self.lLeg, :],
+ # color=(0.4, 0.6, 1, 0.9),
+ # width=4.0,
+ # antialias=True,
+ # )
+ # self.Skel3dViewWidget.addItem(self.lLegLineItem)
+
+ # self.rFootLineItem = gl.GLLinePlotItem(
+ # pos=self.skel_fr_mar_dim[:, self.rFoot, :],
+ # color=(1, 0.2, 0.15, 0.9),
+ # width=4.0,
+ # antialias=True,
+ # )
+ # self.Skel3dViewWidget.addItem(self.rFootLineItem)
+
+ # self.lFootLineItem = gl.GLLinePlotItem(
+ # pos=self.skel_fr_mar_dim[:, self.lFoot, :],
+ # color=(0.4, 0.6, 1, 0.9),
+ # width=4.0,
+ # antialias=True,
+ # )
+ # self.Skel3dViewWidget.addItem(self.lFootLineItem)
+
+ # # plot handybois
+ # self.rHandLineItem = gl.GLLinePlotItem(
+ # pos=self.skel_fr_mar_dim[:, self.rHand, :],
+ # color=(0.2, 0.4, 1, 0.9),
+ # width=1.0,
+ # antialias=True,
+ # )
+ # # self.Skel3dViewWidget.addItem(self.rHandLineItem)
+
+ # self.lHandLineItem = gl.GLLinePlotItem(
+ # pos=self.skel_fr_mar_dim[:, self.lHand, :],
+ # color=(1, 0.1, 0.05, 0.9),
+ # width=1.0,
+ # antialias=True,
+ # )
+ # # self.Skel3dViewWidget.addItem(self.lHandLineItem)
self.useDLC = session.useDLC
if self.useDLC:
@@ -225,37 +235,38 @@ class PlaySkeletonWidget:
)
# connect the dottos
- self.headLineItem.setData(
- pos=self.skel_fr_mar_dim[self.currentFrameNumber, self.head, :]
- )
- self.spineLineItem.setData(
- pos=self.skel_fr_mar_dim[self.currentFrameNumber, self.spine, :]
- )
- self.rArmLineItem.setData(
- pos=self.skel_fr_mar_dim[self.currentFrameNumber, self.rArm, :]
- )
- self.lArmLineItem.setData(
- pos=self.skel_fr_mar_dim[self.currentFrameNumber, self.lArm, :]
- )
- self.rLegLineItem.setData(
- pos=self.skel_fr_mar_dim[self.currentFrameNumber, self.rLeg, :]
- )
- self.lLegLineItem.setData(
- pos=self.skel_fr_mar_dim[self.currentFrameNumber, self.lLeg, :]
- )
- self.rFootLineItem.setData(
- pos=self.skel_fr_mar_dim[self.currentFrameNumber, self.rFoot, :]
- )
- self.lFootLineItem.setData(
- pos=self.skel_fr_mar_dim[self.currentFrameNumber, self.lFoot, :]
- )
+ if self.useOpenPose:
+ self.headLineItem.setData(
+ pos=self.skel_fr_mar_dim[self.currentFrameNumber, self.head, :]
+ )
+ self.spineLineItem.setData(
+ pos=self.skel_fr_mar_dim[self.currentFrameNumber, self.spine, :]
+ )
+ self.rArmLineItem.setData(
+ pos=self.skel_fr_mar_dim[self.currentFrameNumber, self.rArm, :]
+ )
+ self.lArmLineItem.setData(
+ pos=self.skel_fr_mar_dim[self.currentFrameNumber, self.lArm, :]
+ )
+ self.rLegLineItem.setData(
+ pos=self.skel_fr_mar_dim[self.currentFrameNumber, self.rLeg, :]
+ )
+ self.lLegLineItem.setData(
+ pos=self.skel_fr_mar_dim[self.currentFrameNumber, self.lLeg, :]
+ )
+ self.rFootLineItem.setData(
+ pos=self.skel_fr_mar_dim[self.currentFrameNumber, self.rFoot, :]
+ )
+ self.lFootLineItem.setData(
+ pos=self.skel_fr_mar_dim[self.currentFrameNumber, self.lFoot, :]
+ )
- self.rHandLineItem.setData(
- pos=self.skel_fr_mar_dim[self.currentFrameNumber, self.rHand, :]
- )
- self.lHandLineItem.setData(
- pos=self.skel_fr_mar_dim[self.currentFrameNumber, self.lHand, :]
- )
+ self.rHandLineItem.setData(
+ pos=self.skel_fr_mar_dim[self.currentFrameNumber, self.rHand, :]
+ )
+ self.lHandLineItem.setData(
+ pos=self.skel_fr_mar_dim[self.currentFrameNumber, self.lHand, :]
+ )
if self.useDLC:
# Plot DeepLabCut data
diff --git a/freemocap/fmc_trackdata_handler.py b/freemocap/fmc_trackdata_handler.py
index 35fc88c9..90198338 100644
--- a/freemocap/fmc_trackdata_handler.py
+++ b/freemocap/fmc_trackdata_handler.py
@@ -114,7 +114,7 @@ class FmcTracDataHandler(object):
else:
raise ValueError("Object does not contain an actor called: %s" % actor_name)
- def set_header(key, value):
+ def set_header(self,key, value):
self.data["header"][key] = value
def set_version(self, version):
@@ -271,3 +271,35 @@ def save_obj_to_file(file_path, fmxDataObj, override=False):
with open(f, 'wb') as handle:
pickle.dump(fmxDataObj, handle, protocol=2)
print(f"Saved file to: {f.absolute()}")
+
+f = 2
+# import fmc_trackdata_handler as df
+# import openpose_data_mappings as data_mapping
+
+# ## Make empty data structure
+# data_handler = df.FmcTracDataHandler()
+
+# ## Set mapping
+# data_handler.set_parent_mapping(data_mapping.parent_mapping)
+# data_handler.set_point_name_mapping(data_mapping.point_name_mapping)
+
+# ## Load openpose npy data into variable
+# import numpy as np
+# datafile_path = r"C:\Users\Rontc\Documents\GitHub\freemocap\FreeMocap_Data\sesh_21-07-29_104227\DataArrays\openPoseSkel_3d.npy"
+# data = np.load(datafile_path)
+
+# ## Import data into data handler as an actor.
+# #This step can be repeated for multiple datasets, adding each as an individual actor
+# actor_name = "tester"
+# data_handler.import_actor_raw_data(actor_name, data)
+
+# ## Saving data handler object to file
+# file_path = r"C:\Users\Rontc\Documents\GitHub\freemocap\FreeMocap_Data\sesh_21-07-29_104227\DataArrays\openPoseSkel_3d" # Suffix is being set to FILE_SUFFIX automatically
+# df.save_obj_to_file(file_path, data_handler, override=False)
+
+# ## Loading data handler from file
+# file_path = r"C:\Users\Rontc\Documents\GitHub\freemocap\FreeMocap_Data\sesh_21-07-29_104227\DataArrays\openPoseSkel_3d.fmcData"
+# data_h = df.load_obj_from_file(file_path)
+
+# f = 2
+
diff --git a/freemocap/user_preferences.yaml b/freemocap/user_preferences.yaml
new file mode 100644
index 00000000..ebbd6136
--- /dev/null
+++ b/freemocap/user_preferences.yaml
@@ -0,0 +1,11 @@
+default:
+ path_to_save: C:\Users\Rontc\Documents\GitHub\freemocap
+ dlc_config_paths: []
+ rotations: {}
+ parameters:
+ exposure: -5
+ resWidth: 640
+ resHeight: 480
+ framerate: 25
+ codec: DIVX
+saved: {}
diff --git a/freemocap_runme_script (DESKTOP-5BEPF2F's conflicted copy 2021-07-20).py b/freemocap_runme_script (DESKTOP-5BEPF2F's conflicted copy 2021-07-20).py
deleted file mode 100644
index 48cdd35c..00000000
--- a/freemocap_runme_script (DESKTOP-5BEPF2F's conflicted copy 2021-07-20).py
+++ /dev/null
@@ -1,10 +0,0 @@
-import freemocap as fmc
-from pathlib import Path
-import socket
-
-dlcConfigPath = Path(r"C:\Users\jonma\Dropbox\DLC_Models\PinkGreenRedJugglingBalls-JSM-2021-05-31\config.yaml")
-
-if socket.gethostname() == 'DESKTOP-DCG6K4F':
- fmc.RunMe( sessionID='sesh_21-07-19_231345', stage=7, openPoseDummyRun=True, useDLC = True, dlcConfigPath=dlcConfigPath, recordVid = False)
-else:
- fmc.RunMe( stage = 7, useDLC = True, dlcConfigPath=dlcConfigPath, recordVid = False)
diff --git a/freemocap_runme_script.py b/freemocap_runme_script.py
index 2babb134..65654f84 100644
--- a/freemocap_runme_script.py
+++ b/freemocap_runme_script.py
@@ -2,9 +2,11 @@ import freemocap as fmc
from pathlib import Path
import socket
-dlcConfigPath = Path(r"C:\Users\jonma\Dropbox\DLC_Models\PinkGreenRedJugglingBalls-JSM-2021-05-31\config.yaml")
+# dlcConfigPath = Path(r"C:\Users\jonma\Dropbox\DLC_Models\PinkGreenRedJugglingBalls-JSM-2021-05-31\config.yaml")
-if socket.gethostname() == 'DESKTOP-DCG6K4F':
- fmc.RunMe( stage=7, openPoseDummyRun=True, useDLC = True, dlcConfigPath=dlcConfigPath, recordVid = True)
-else:
- fmc.RunMe(sessionID = 'sesh_21-07-29_112223',stage = 7,useOpenPose=True, useMediaPipe=True)
+# if socket.gethostname() == 'DESKTOP-DCG6K4F':
+# fmc.RunMe( stage=7, openPoseDummyRun=True, useDLC = True, dlcConfigPath=dlcConfigPath, recordVid = True)
+# else:
+# fmc.RunMe( useDLC = True, dlcConfigPath=dlcConfigPath, recordVid = True)
+
+fmc.RunMe(sessionID = 'sesh_21-07-29_104227', stage = 6, useMediaPipe=True, useOpenPose=False, setDataPath = True)
diff --git a/test_script_data_handler.py b/test_script_data_handler.py
new file mode 100644
index 00000000..aec2751f
--- /dev/null
+++ b/test_script_data_handler.py
@@ -0,0 +1,26 @@
+from freemocap import fmc_trackdata_handler as df
+from freemocap import openpose_data_mappings as data_mapping
+
+### Make empty data structure
+data_handler = df.FmcTracDataHandler()
+
+### Set mapping
+data_handler.set_parent_mapping(data_mapping.parent_mapping)
+data_handler.set_point_name_mapping(data_mapping.point_name_mapping)
+
+### Load openpose npy data into variable
+import numpy as np
+datafile_path = r"C:\Users\Rontc\Documents\GitHub\freemocap\FreeMocap_Data\sesh_21-07-29_104227\DataArrays\openPoseSkel_3d.npy"
+data = np.load(datafile_path)
+
+### Import data into data handler as an actor.
+# This step can be repeated for multiple datasets, adding each as an individual actor
+actor_name = "tester"
+data_handler.import_actor_raw_data(actor_name, data)
+
+### Saving data handler object to file
+file_path = r"C:\Users\Rontc\Documents\GitHub\freemocap\FreeMocap_Data\sesh_21-07-29_104227\DataArrays\openPoseSkel_3d" # Suffix is being set to FILE_SUFFIX automatically
+df.save_obj_to_file(file_path, data_handler, override=False)
+### Loading data handler from file
+file_path = r"C:\Users\Rontc\Documents\GitHub\freemocap\FreeMocap_Data\sesh_21-07-29_104227\DataArrays\openPoseSkel_3d.fmcData"
+data_h = df.load_obj_from_file(file_path)