Skip to content

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

TypeScript

Jon/full refactor (#332)

jonmatthis1e5e6aba85a9
diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index 79a13427..00000000
--- a/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-freemocap/_version.py export-subst
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 3ce9b9d6..3c2213c9 100755
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,6 +1,6 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
+# Please see the documentation for all system options:
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
version: 2
diff --git a/.github/workflows/python-testing.yml b/.github/workflows/python-testing.yml
index 2adbfa28..d30213f3 100755
--- a/.github/workflows/python-testing.yml
+++ b/.github/workflows/python-testing.yml
@@ -2,9 +2,9 @@ name: Freemocap Tests
on:
pull_request:
- branches: [ icis_conference_main ]
+ branches: [ jon/full-refactor ]
paths:
- - src
+ - freemocap
jobs:
build:
@@ -23,9 +23,10 @@ jobs:
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
- - name: Run Tests
+ - name: Run Tests with Pytest
run: |
- task test
+ pip install pytest
+ pytest freemocap/tests/test_test.py
- name: Upload pytest test results
uses: actions/upload-artifact@v3
with:
diff --git a/.gitignore b/.gitignore
index 8f381f13..ff27f57e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -108,8 +108,8 @@ celerybeat.pid
*.sage.py
# Environments
-.env
-.venv
+.env*
+.venv*
env/
venv/
ENV/
@@ -142,7 +142,7 @@ freemocap/fmc_startup/user_preferences.yaml
.obsidian/
data/
-freemocap-ui/threejs_stuff/
+experimental/freemocap-ui/threejs_stuff/
*.avi
*.mp4
@@ -156,3 +156,4 @@ freemocap/fmc_calibration/
.DS_Store
desktop.ini
+/BlendArMocap/
diff --git a/CITATION.cff b/CITATION.cff
index 9ddd6026..65f0d9ac 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -1,12 +1,15 @@
cff-version: 1.2.0
message: "If you use this software, please cite it as below."
authors:
+ - family-names: Cherian
+ given-names: Aaron
+ - family-names: Endurance
+ given-names: Idehen
- family-names: Matthis
given-names: Jonathan Samir
orcid: https://orcid.org/my-orcid?orcid=0000-0003-3683-646X
- - family-names: Cherian
- given-names: Aaron
-
+
+
title: "FreeMoCap: A free, open source markerless motion capture system"
doi: 10.5281/zenodo.7233714
diff --git a/MANIFEST.in b/MANIFEST.in
index 105b6c2e..825cda41 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,19 +1,13 @@
-include AUTHORS.rst
-include CONTRIBUTING.rst
include LICENSE
-include README.rst
include requirements.txt
recursive-exclude * __pycache__
recursive-exclude * *.py[co]
-recursive-include docs *.rst conf.py Makefile make.bat
+include bin/*
+include assets*
+include *.md
-include versioneer.py
-include freemocap/_version.py
-
-include freemocap/logo/*
-include freemocap/freemocap/build_data.npy
# If including data files in the package, add them like:
# include path/to/data_file
diff --git a/README.md b/README.md
index e46aee6d..28425138 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@
<a href="https://github.com/psf/black">
<img alt="https://img.shields.io/badge/code%20style-black-000000.svg" src="https://img.shields.io/badge/code%20style-black-000000.svg">
</a>
-
+
<a href="https://github.com/freemocap/freemocap/releases/latest">
<img src="https://img.shields.io/github/release/freemocap/freemocap.svg" alt="Latest Release">
</a>
@@ -31,12 +31,12 @@
<a href="https://github.com/psf/black">
<img alt="https://img.shields.io/badge/code%20style-black-000000.svg" src="https://img.shields.io/badge/code%20style-black-000000.svg">
</a>
-
-<a href="https://discord.gg/SgdnzbHDTG">
+
+<a href="https://discord.gg/SgdnzbHDTG">
<img alt="Discord Community Server" src="https://dcbadge.vercel.app/api/server/SgdnzbHDTG?style=flat">
</a>
-
+
</p>
@@ -47,21 +47,21 @@ ___
# How to use the `pre-alpha` code
-We're in the process of switching over to the `alpha` phase of this project (`v0.1.0` and on) , which use full refactor code written with help from a professional experienced software architect.
+We're in the process of switching over to the `alpha` phase of this project (`v0.1.0` and on) , which use full refactor code written with help from a professional experienced software architect.
Until the new code stabilizes, you may have more luck using the `pre-alpha` code (e.g. `v0.0.54`)
---
-## INSTALLATION
+## INSTALLATION
Note: This will install the latest/last version from the `pre-alpha` phase of this project, frozen at release tag `v0.0.54` [here](https://github.com/freemocap/freemocap/releases/tag/v0.0.54)
Open an Anaconda-enabled command prompt or powershell window and enter the following commands:
1) Create a Python3.7 Anaconda environment
-```bash
+```bash
conda create -n freemocap-env python=3.7
-```
+```
2) Activate that newly created environment
```bash
@@ -85,28 +85,28 @@ import freemocap
freemocap.RunMe()
```
-But COOL KIDS will install Blender ([blender.org](https://blender.org) and generate an awesome `.blend` file animation by setting `useBlender=True`:
+But COOL KIDS will install Blender ([blender.org](https://blender.org) and generate an awesome `.blend` file animation by setting `useBlender=True`:
```python
import freemocap
freemocap.RunMe(useBlender=True)
```
-:point_right: **For additional, more detailed instructions (including methods to re-process recorded sessions), [refer to the `OLD_README.md` document](https://github.com/freemocap/freemocap/blob/main/OLD_README.md))** :point_left:
+:point_right: **For additional, more detailed instructions (including methods to re-process recorded sessions), [refer to the `OLD_README.md` document](https://github.com/freemocap/freemocap/blob/main/OLD_README.md))** :point_left:
___
# HOW TO RUN THE `alpha` GUI
NOTES
-- no promises here, friends. Work in progress lol :joy:
+- no promises here, friends. Work in progress lol :joy:
- Personally, I run the gui through PyCharm, but its easier to write instructions on how to run from an anaconda prompt
-
+
## Pre-requisites:
1. Install Anaconda
- https://anaconda.org
-2. Install git
- - https://git-scm.com/book/en/v2/Getting-Started-Installing-Git (just use the defaults)
+2. Install git
+ - https://git-scm.com/book/en/v2/Getting-Started-Installing-Git (just use the defaults)
3. (OPTIONAL) Install Blender - https://blender.org
## Installation instructions
@@ -140,7 +140,7 @@ pip install -r requirements.txt
7. Run the GUI by running the `src/gui/main/main.py` file by entering this command into the terminal:
```bash
-python src/gui/main/main.py
+python old_src/gui/main/main.py
```
8. Hopefully a GUI popped up! There are no docs on usage yet, so just click and see what you can figure out :joy:
@@ -149,11 +149,11 @@ python src/gui/main/main.py
At the moment, the `alpha GUI`'s method for connecting to the cameras is very innefficient and will experience framerate drops with more than ~3 cameras (even with a powerful PC). We're working on a fix, and should have it handled soon! In the mean time, you can still use the GUI to process videos recorded with other methods (workflow described in the next section!)
__
-# Create 3D skeleton animations from externally recorded (and synchronized) videos :sparkles:
+# Create 3D skeleton animations from externally recorded (and synchronized) videos :sparkles:
You can use `alpha GUI` to process videos that were recorded and synchronized from any source!
-Simply synchronize your videos in whatever way you wish, convert them to `.mp4` format, and place them all in a single folder.
+Simply synchronize your videos in whatever way you wish, convert them to `.mp4` format, and place them all in a single folder.
Then, *import* that folder via the `Import Videos` button in the GUI and follow the standard processing steps
diff --git a/assets/logo/freemocap-logo-black-border.svg b/assets/logo/freemocap-logo-black-border.svg
index 86d72f70..33450edb 100644
--- a/assets/logo/freemocap-logo-black-border.svg
+++ b/assets/logo/freemocap-logo-black-border.svg
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1"
- id="svg8" inkscape:version="1.0.2 (e86c8708, 2021-01-15)" sodipodi:docname="fmc-logo-border-2.svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 461.4 584.5"
- style="enable-background:new 0 0 461.4 584.5;" xml:space="preserve">
+ id="svg8" inkscape:version="1.0.2 (e86c8708, 2021-01-15)" sodipodi:docname="fmc-logo-border-2.svg"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ viewBox="0 0 461.4 584.5"
+ style="enable-background:new 0 0 461.4 584.5;" xml:space="preserve">
<style type="text/css">
.st0{display:none;}
.st1{display:none;fill:#A4D6D9;}
@@ -17,10 +20,10 @@
<ellipse id="path962" cx="171.3" cy="282.5" rx="146.1" ry="160.4"/>
</g>
<g id="layer1" transform="translate(-32.625961,-40.2606)" inkscape:groupmode="layer" inkscape:label="Layer 1">
-
+
<image style="display:none;overflow:visible;enable-background:new ;" width="1668" height="2224" id="image843" xlink:href="16530232.png" transform="matrix(0.3849 0 0 0.3691 -49.7662 -67.5522)">
</image>
-
+
<image style="display:none;overflow:visible;enable-background:new ;" width="1668" height="2224" id="image865" xlink:href="16530236.png" transform="matrix(0.4143 0 0 0.3995 -66.2662 -100.5522)">
</image>
<path id="path853" class="st1" d="M167.8,601.5c-3.5-0.8-5.5-1.7-9.6-4.6c-4.1-2.8-6.6-5.5-9.4-10.2c-5-8.3-7.4-17.6-7.9-30.1
diff --git a/bin/installer.sh b/bin/installer.sh
index c88332d2..4eccb2fa 100755
--- a/bin/installer.sh
+++ b/bin/installer.sh
@@ -1,9 +1,2 @@
-pyinstaller \
- --name="FreeMoCap" \
- --windowed \
- --onefile \
- --hidden-import pyqtgraph.graphicsItems.ViewBox.axisCtrlTemplate_pyqt6 \
- --hidden-import pyqtgraph.graphicsItems.PlotItem.plotConfigTemplate_pyqt6 \
- --hidden-import pyqtgraph.imageview.ImageViewTemplate_pyqt6 \
- ./src/gui/main/main.py
+pyinstaller --name="FreeMoCap" --windowed --onefile --hidden-import pyqtgraph.graphicsItems.ViewBox.axisCtrlTemplate_pyqt6 --hidden-import pyqtgraph.graphicsItems.PlotItem.plotConfigTemplate_pyqt6 --hidden-import pyqtgraph.imageview.ImageViewTemplate_pyqt6 .\freemocap\__main__.py
diff --git a/bin/linux/run_web_server.sh b/bin/linux/run_web_server.sh
index 89cf5dd6..0022ef0d 100755
--- a/bin/linux/run_web_server.sh
+++ b/bin/linux/run_web_server.sh
@@ -3,6 +3,6 @@
# Start the webserver
# shellcheck disable=SC2086
-gunicorn -b 0.0.0.0:8080 --timeout 0 -w 1 -k uvicorn.workers.UvicornWorker 'src.api.app_factory:create_app()'
-#hypercorn 'src.api.app_factory:create_app()' --bind 0.0.0.0:8080 --websocket-ping-interval 1000
-#uvicorn --factory src.api.app_factory:create_app --port 8080 --host 0.0.0.0 --workers 4
+gunicorn -b 0.0.0.0:8080 --timeout 0 -w 1 -k uvicorn.workers.UvicornWorker 'old_src.api.app_factory:create_app()'
+#hypercorn 'old_src.api.app_factory:create_app()' --bind 0.0.0.0:8080 --websocket-ping-interval 1000
+#uvicorn --factory old_src.api.app_factory:create_app --port 8080 --host 0.0.0.0 --workers 4
diff --git a/freemocap-ui/.gitignore b/experimental/freemocap-ui/.gitignore
similarity index 100%
rename from freemocap-ui/.gitignore
rename to experimental/freemocap-ui/.gitignore
diff --git a/freemocap-ui/README.md b/experimental/freemocap-ui/README.md
similarity index 100%
rename from freemocap-ui/README.md
rename to experimental/freemocap-ui/README.md
diff --git a/freemocap-ui/config-overrides.js b/experimental/freemocap-ui/config-overrides.js
similarity index 100%
rename from freemocap-ui/config-overrides.js
rename to experimental/freemocap-ui/config-overrides.js
diff --git a/freemocap-ui/package.json b/experimental/freemocap-ui/package.json
similarity index 98%
rename from freemocap-ui/package.json
rename to experimental/freemocap-ui/package.json
index 4e6c034e..a1a5c9b9 100644
--- a/freemocap-ui/package.json
+++ b/experimental/freemocap-ui/package.json
@@ -64,7 +64,7 @@
},
"scripts": {
"start:https": "HTTPS=true SSL_CRT_FILE=./localhost.pem SSL_KEY_FILE=./localhost-key.pem react-scripts start",
- "certs": "./scripts/cert.sh",
+ "certs": "scripts/cert.sh",
"start": "react-app-rewired start",
"build": "react-app-rewired build",
"test": "react-app-rewired test",
diff --git a/freemocap-ui/public/favicon.ico b/experimental/freemocap-ui/public/favicon.ico
similarity index 100%
rename from freemocap-ui/public/favicon.ico
rename to experimental/freemocap-ui/public/favicon.ico
diff --git a/freemocap-ui/public/index.html b/experimental/freemocap-ui/public/index.html
similarity index 96%
rename from freemocap-ui/public/index.html
rename to experimental/freemocap-ui/public/index.html
index 43af94cc..049d064f 100644
--- a/freemocap-ui/public/index.html
+++ b/experimental/freemocap-ui/public/index.html
@@ -41,6 +41,6 @@
-->
</body>
<script type="text/javascript" src="https://unpkg.com/[email protected]/lib/opencv.js"></script>
-<!-- <script src="https://unpkg.com/opencv-javascript"></script>-->
+<!-- <script old_src="https://unpkg.com/opencv-javascript"></script>-->
</html>
diff --git a/freemocap-ui/public/logo192.png b/experimental/freemocap-ui/public/logo192.png
similarity index 100%
rename from freemocap-ui/public/logo192.png
rename to experimental/freemocap-ui/public/logo192.png
diff --git a/freemocap-ui/public/logo512.png b/experimental/freemocap-ui/public/logo512.png
similarity index 100%
rename from freemocap-ui/public/logo512.png
rename to experimental/freemocap-ui/public/logo512.png
diff --git a/freemocap-ui/public/manifest.json b/experimental/freemocap-ui/public/manifest.json
similarity index 100%
rename from freemocap-ui/public/manifest.json
rename to experimental/freemocap-ui/public/manifest.json
diff --git a/freemocap-ui/public/robots.txt b/experimental/freemocap-ui/public/robots.txt
similarity index 100%
rename from freemocap-ui/public/robots.txt
rename to experimental/freemocap-ui/public/robots.txt
diff --git a/freemocap-ui/scripts/cert.sh b/experimental/freemocap-ui/scripts/cert.sh
old mode 100755
new mode 100644
similarity index 100%
rename from freemocap-ui/scripts/cert.sh
rename to experimental/freemocap-ui/scripts/cert.sh
diff --git a/freemocap-ui/src/App.css b/experimental/freemocap-ui/src/App.css
similarity index 100%
rename from freemocap-ui/src/App.css
rename to experimental/freemocap-ui/src/App.css
diff --git a/freemocap-ui/src/App.test.tsx b/experimental/freemocap-ui/src/App.test.tsx
similarity index 66%
rename from freemocap-ui/src/App.test.tsx
rename to experimental/freemocap-ui/src/App.test.tsx
index 659cc13d..3de36791 100644
--- a/freemocap-ui/src/App.test.tsx
+++ b/experimental/freemocap-ui/src/App.test.tsx
@@ -1,7 +1,7 @@
import React from 'react';
-import { render } from '@testing-library/react';
-import { Provider } from 'react-redux';
-import { store } from './app/store';
+import {render} from '@testing-library/react';
+import {Provider} from 'react-redux';
+import {store} from './app/store';
import App from './App';
test('renders learn react link', () => {
diff --git a/freemocap-ui/src/App.tsx b/experimental/freemocap-ui/src/App.tsx
similarity index 100%
rename from freemocap-ui/src/App.tsx
rename to experimental/freemocap-ui/src/App.tsx
diff --git a/freemocap-ui/src/app/hooks.ts b/experimental/freemocap-ui/src/app/hooks.ts
similarity index 62%
rename from freemocap-ui/src/app/hooks.ts
rename to experimental/freemocap-ui/src/app/hooks.ts
index 520e84ed..4f0edcf7 100644
--- a/freemocap-ui/src/app/hooks.ts
+++ b/experimental/freemocap-ui/src/app/hooks.ts
@@ -1,5 +1,5 @@
-import { TypedUseSelectorHook, useDispatch, useSelector } from 'react-redux';
-import type { RootState, AppDispatch } from './store';
+import {TypedUseSelectorHook, useDispatch, useSelector} from 'react-redux';
+import type {AppDispatch, RootState} from './store';
// Use throughout your app instead of plain `useDispatch` and `useSelector`
export const useAppDispatch = () => useDispatch<AppDispatch>();
diff --git a/freemocap-ui/src/app/store.ts b/experimental/freemocap-ui/src/app/store.ts
similarity index 83%
rename from freemocap-ui/src/app/store.ts
rename to experimental/freemocap-ui/src/app/store.ts
index 133ff34e..3c87d330 100644
--- a/freemocap-ui/src/app/store.ts
+++ b/experimental/freemocap-ui/src/app/store.ts
@@ -1,4 +1,4 @@
-import { configureStore, ThunkAction, Action } from '@reduxjs/toolkit';
+import {Action, configureStore, ThunkAction} from '@reduxjs/toolkit';
import counterReducer from '../features/counter/counterSlice';
export const store = configureStore({
diff --git a/freemocap-ui/src/components/start-stop-process.tsx b/experimental/freemocap-ui/src/components/start-stop-process.tsx
similarity index 100%
rename from freemocap-ui/src/components/start-stop-process.tsx
rename to experimental/freemocap-ui/src/components/start-stop-process.tsx
diff --git a/freemocap-ui/src/components/webcam/LivePreview.tsx b/experimental/freemocap-ui/src/components/webcam/LivePreview.tsx
similarity index 100%
rename from freemocap-ui/src/components/webcam/LivePreview.tsx
rename to experimental/freemocap-ui/src/components/webcam/LivePreview.tsx
diff --git a/freemocap-ui/src/components/webcam/webcam-capture.tsx b/experimental/freemocap-ui/src/components/webcam/webcam-capture.tsx
similarity index 100%
rename from freemocap-ui/src/components/webcam/webcam-capture.tsx
rename to experimental/freemocap-ui/src/components/webcam/webcam-capture.tsx
diff --git a/freemocap-ui/src/components/webcam/webcam.tsx b/experimental/freemocap-ui/src/components/webcam/webcam.tsx
similarity index 51%
rename from freemocap-ui/src/components/webcam/webcam.tsx
rename to experimental/freemocap-ui/src/components/webcam/webcam.tsx
index 786182cc..caf49329 100644
--- a/freemocap-ui/src/components/webcam/webcam.tsx
+++ b/experimental/freemocap-ui/src/components/webcam/webcam.tsx
@@ -1,5 +1,4 @@
-
-import { default as Webcam } from 'react-webcam';
+import {default as Webcam} from 'react-webcam';
export const SomeWebcam = () => {
return <Webcam />
diff --git a/freemocap-ui/src/features/camera/cameraSlice.tsx b/experimental/freemocap-ui/src/features/camera/cameraSlice.tsx
similarity index 89%
rename from freemocap-ui/src/features/camera/cameraSlice.tsx
rename to experimental/freemocap-ui/src/features/camera/cameraSlice.tsx
index 1bf6cf75..2b37002f 100644
--- a/freemocap-ui/src/features/camera/cameraSlice.tsx
+++ b/experimental/freemocap-ui/src/features/camera/cameraSlice.tsx
@@ -1,4 +1,4 @@
-import { createSlice, PayloadAction } from '@reduxjs/toolkit'
+import {createSlice, PayloadAction} from '@reduxjs/toolkit'
export class AppCameraState {
diff --git a/freemocap-ui/src/features/counter/Counter.module.css b/experimental/freemocap-ui/src/features/counter/Counter.module.css
similarity index 100%
rename from freemocap-ui/src/features/counter/Counter.module.css
rename to experimental/freemocap-ui/src/features/counter/Counter.module.css
diff --git a/freemocap-ui/src/features/counter/Counter.tsx b/experimental/freemocap-ui/src/features/counter/Counter.tsx
similarity index 86%
rename from freemocap-ui/src/features/counter/Counter.tsx
rename to experimental/freemocap-ui/src/features/counter/Counter.tsx
index ece5191b..297369e7 100644
--- a/freemocap-ui/src/features/counter/Counter.tsx
+++ b/experimental/freemocap-ui/src/features/counter/Counter.tsx
@@ -1,14 +1,7 @@
-import React, { useState } from 'react';
+import React, {useState} from 'react';
-import { useAppSelector, useAppDispatch } from '../../app/hooks';
-import {
- decrement,
- increment,
- incrementByAmount,
- incrementAsync,
- incrementIfOdd,
- selectCount,
-} from './counterSlice';
+import {useAppDispatch, useAppSelector} from '../../app/hooks';
+import {decrement, increment, incrementAsync, incrementByAmount, incrementIfOdd, selectCount,} from './counterSlice';
import styles from './Counter.module.css';
export function Counter() {
diff --git a/freemocap-ui/src/features/counter/counterAPI.ts b/experimental/freemocap-ui/src/features/counter/counterAPI.ts
similarity index 100%
rename from freemocap-ui/src/features/counter/counterAPI.ts
rename to experimental/freemocap-ui/src/features/counter/counterAPI.ts
diff --git a/freemocap-ui/src/features/counter/counterSlice.spec.ts b/experimental/freemocap-ui/src/features/counter/counterSlice.spec.ts
similarity index 86%
rename from freemocap-ui/src/features/counter/counterSlice.spec.ts
rename to experimental/freemocap-ui/src/features/counter/counterSlice.spec.ts
index 098163b9..e7f964a5 100644
--- a/freemocap-ui/src/features/counter/counterSlice.spec.ts
+++ b/experimental/freemocap-ui/src/features/counter/counterSlice.spec.ts
@@ -1,9 +1,4 @@
-import counterReducer, {
- CounterState,
- increment,
- decrement,
- incrementByAmount,
-} from './counterSlice';
+import counterReducer, {CounterState, decrement, increment, incrementByAmount,} from './counterSlice';
describe('counter reducer', () => {
const initialState: CounterState = {
diff --git a/freemocap-ui/src/features/counter/counterSlice.ts b/experimental/freemocap-ui/src/features/counter/counterSlice.ts
similarity index 94%
rename from freemocap-ui/src/features/counter/counterSlice.ts
rename to experimental/freemocap-ui/src/features/counter/counterSlice.ts
index 0010332a..15a028fc 100644
--- a/freemocap-ui/src/features/counter/counterSlice.ts
+++ b/experimental/freemocap-ui/src/features/counter/counterSlice.ts
@@ -1,6 +1,6 @@
-import { createAsyncThunk, createSlice, PayloadAction } from '@reduxjs/toolkit';
-import { RootState, AppThunk } from '../../app/store';
-import { fetchCount } from './counterAPI';
+import {createAsyncThunk, createSlice, PayloadAction} from '@reduxjs/toolkit';
+import {AppThunk, RootState} from '../../app/store';
+import {fetchCount} from './counterAPI';
export interface CounterState {
value: number;
diff --git a/freemocap-ui/src/hooks/use-device-stream.ts b/experimental/freemocap-ui/src/hooks/use-device-stream.ts
similarity index 100%
rename from freemocap-ui/src/hooks/use-device-stream.ts
rename to experimental/freemocap-ui/src/hooks/use-device-stream.ts
diff --git a/freemocap-ui/src/hooks/use-frame-capture.tsx b/experimental/freemocap-ui/src/hooks/use-frame-capture.tsx
similarity index 100%
rename from freemocap-ui/src/hooks/use-frame-capture.tsx
rename to experimental/freemocap-ui/src/hooks/use-frame-capture.tsx
diff --git a/freemocap-ui/src/index.css b/experimental/freemocap-ui/src/index.css
similarity index 100%
rename from freemocap-ui/src/index.css
rename to experimental/freemocap-ui/src/index.css
diff --git a/freemocap-ui/src/index.tsx b/experimental/freemocap-ui/src/index.tsx
similarity index 87%
rename from freemocap-ui/src/index.tsx
rename to experimental/freemocap-ui/src/index.tsx
index 9cc8015d..44fee373 100644
--- a/freemocap-ui/src/index.tsx
+++ b/experimental/freemocap-ui/src/index.tsx
@@ -2,8 +2,8 @@ import React from 'react';
import ReactDOM from 'react-dom';
import './index.css';
import App from './App';
-import { store } from './app/store';
-import { Provider } from 'react-redux';
+import {store} from './app/store';
+import {Provider} from 'react-redux';
import * as serviceWorker from './serviceWorker';
ReactDOM.render(
diff --git a/freemocap-ui/src/layout/Copyright.tsx b/experimental/freemocap-ui/src/layout/Copyright.tsx
similarity index 100%
rename from freemocap-ui/src/layout/Copyright.tsx
rename to experimental/freemocap-ui/src/layout/Copyright.tsx
diff --git a/freemocap-ui/src/layout/Header.tsx b/experimental/freemocap-ui/src/layout/Header.tsx
similarity index 100%
rename from freemocap-ui/src/layout/Header.tsx
rename to experimental/freemocap-ui/src/layout/Header.tsx
diff --git a/freemocap-ui/src/layout/Navigator.tsx b/experimental/freemocap-ui/src/layout/Navigator.tsx
similarity index 100%
rename from freemocap-ui/src/layout/Navigator.tsx
rename to experimental/freemocap-ui/src/layout/Navigator.tsx
diff --git a/freemocap-ui/src/layout/Paperbase.tsx b/experimental/freemocap-ui/src/layout/Paperbase.tsx
similarity index 100%
rename from freemocap-ui/src/layout/Paperbase.tsx
rename to experimental/freemocap-ui/src/layout/Paperbase.tsx
diff --git a/freemocap-ui/src/layout/content/BaseContent.tsx b/experimental/freemocap-ui/src/layout/content/BaseContent.tsx
similarity index 100%
rename from freemocap-ui/src/layout/content/BaseContent.tsx
rename to experimental/freemocap-ui/src/layout/content/BaseContent.tsx
diff --git a/freemocap-ui/src/layout/content/BasePaper.tsx b/experimental/freemocap-ui/src/layout/content/BasePaper.tsx
similarity index 100%
rename from freemocap-ui/src/layout/content/BasePaper.tsx
rename to experimental/freemocap-ui/src/layout/content/BasePaper.tsx
diff --git a/freemocap-ui/src/layout/content/Content.tsx b/experimental/freemocap-ui/src/layout/content/Content.tsx
similarity index 100%
rename from freemocap-ui/src/layout/content/Content.tsx
rename to experimental/freemocap-ui/src/layout/content/Content.tsx
diff --git a/freemocap-ui/src/layout/routing/router.tsx b/experimental/freemocap-ui/src/layout/routing/router.tsx
similarity index 100%
rename from freemocap-ui/src/layout/routing/router.tsx
rename to experimental/freemocap-ui/src/layout/routing/router.tsx
diff --git a/freemocap-ui/src/logo.svg b/experimental/freemocap-ui/src/logo.svg
similarity index 100%
rename from freemocap-ui/src/logo.svg
rename to experimental/freemocap-ui/src/logo.svg
diff --git a/freemocap-ui/src/react-app-env.d.ts b/experimental/freemocap-ui/src/react-app-env.d.ts
similarity index 100%
rename from freemocap-ui/src/react-app-env.d.ts
rename to experimental/freemocap-ui/src/react-app-env.d.ts
diff --git a/freemocap-ui/src/serviceWorker.ts b/experimental/freemocap-ui/src/serviceWorker.ts
similarity index 100%
rename from freemocap-ui/src/serviceWorker.ts
rename to experimental/freemocap-ui/src/serviceWorker.ts
diff --git a/freemocap-ui/src/services/Capture.tsx b/experimental/freemocap-ui/src/services/Capture.tsx
similarity index 100%
rename from freemocap-ui/src/services/Capture.tsx
rename to experimental/freemocap-ui/src/services/Capture.tsx
diff --git a/freemocap-ui/src/services/Record.ts b/experimental/freemocap-ui/src/services/Record.ts
similarity index 100%
rename from freemocap-ui/src/services/Record.ts
rename to experimental/freemocap-ui/src/services/Record.ts
diff --git a/freemocap-ui/src/services/cam.ts b/experimental/freemocap-ui/src/services/cam.ts
similarity index 100%
rename from freemocap-ui/src/services/cam.ts
rename to experimental/freemocap-ui/src/services/cam.ts
diff --git a/freemocap-ui/src/services/download.ts b/experimental/freemocap-ui/src/services/download.ts
similarity index 100%
rename from freemocap-ui/src/services/download.ts
rename to experimental/freemocap-ui/src/services/download.ts
diff --git a/freemocap-ui/src/services/frame-capture.tsx b/experimental/freemocap-ui/src/services/frame-capture.tsx
similarity index 100%
rename from freemocap-ui/src/services/frame-capture.tsx
rename to experimental/freemocap-ui/src/services/frame-capture.tsx
diff --git a/freemocap-ui/src/services/image_send_worker.ts b/experimental/freemocap-ui/src/services/image_send_worker.ts
similarity index 100%
rename from freemocap-ui/src/services/image_send_worker.ts
rename to experimental/freemocap-ui/src/services/image_send_worker.ts
diff --git a/freemocap-ui/src/services/recorder.ts b/experimental/freemocap-ui/src/services/recorder.ts
similarity index 100%
rename from freemocap-ui/src/services/recorder.ts
rename to experimental/freemocap-ui/src/services/recorder.ts
diff --git a/freemocap-ui/src/services/supported_recorder.ts b/experimental/freemocap-ui/src/services/supported_recorder.ts
similarity index 100%
rename from freemocap-ui/src/services/supported_recorder.ts
rename to experimental/freemocap-ui/src/services/supported_recorder.ts
diff --git a/freemocap-ui/src/setupTests.ts b/experimental/freemocap-ui/src/setupTests.ts
similarity index 80%
rename from freemocap-ui/src/setupTests.ts
rename to experimental/freemocap-ui/src/setupTests.ts
index 74b1a275..8194b6fc 100644
--- a/freemocap-ui/src/setupTests.ts
+++ b/experimental/freemocap-ui/src/setupTests.ts
@@ -2,4 +2,4 @@
// allows you to do things like:
// expect(element).toHaveTextContent(/react/i)
// learn more: https://github.com/testing-library/jest-dom
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom/extend-expect';
\ No newline at end of file
diff --git a/freemocap-ui/src/views/Capture.tsx b/experimental/freemocap-ui/src/views/Capture.tsx
similarity index 100%
rename from freemocap-ui/src/views/Capture.tsx
rename to experimental/freemocap-ui/src/views/Capture.tsx
diff --git a/freemocap-ui/src/views/Config.tsx b/experimental/freemocap-ui/src/views/Config.tsx
similarity index 100%
rename from freemocap-ui/src/views/Config.tsx
rename to experimental/freemocap-ui/src/views/Config.tsx
diff --git a/freemocap-ui/src/views/SessionWorkflow.tsx b/experimental/freemocap-ui/src/views/SessionWorkflow.tsx
similarity index 100%
rename from freemocap-ui/src/views/SessionWorkflow.tsx
rename to experimental/freemocap-ui/src/views/SessionWorkflow.tsx
diff --git a/freemocap-ui/src/views/ShowCameras.tsx b/experimental/freemocap-ui/src/views/ShowCameras.tsx
similarity index 100%
rename from freemocap-ui/src/views/ShowCameras.tsx
rename to experimental/freemocap-ui/src/views/ShowCameras.tsx
diff --git a/freemocap-ui/src/views/UserConfig.tsx b/experimental/freemocap-ui/src/views/UserConfig.tsx
similarity index 100%
rename from freemocap-ui/src/views/UserConfig.tsx
rename to experimental/freemocap-ui/src/views/UserConfig.tsx
diff --git a/freemocap-ui/src/views/prod/ConfigForm.tsx b/experimental/freemocap-ui/src/views/prod/ConfigForm.tsx
similarity index 93%
rename from freemocap-ui/src/views/prod/ConfigForm.tsx
rename to experimental/freemocap-ui/src/views/prod/ConfigForm.tsx
index 23e25785..1376077a 100644
--- a/freemocap-ui/src/views/prod/ConfigForm.tsx
+++ b/experimental/freemocap-ui/src/views/prod/ConfigForm.tsx
@@ -1,4 +1,4 @@
-import {Typography, TextField, Button} from "@mui/material"
+import {Button, TextField, Typography} from "@mui/material"
import {Box} from "@mui/system";
import {default as NumberFormat} from 'react-number-format';
diff --git a/freemocap-ui/src/views/prod/SetupAndPreviewCamera.tsx b/experimental/freemocap-ui/src/views/prod/SetupAndPreviewCamera.tsx
similarity index 100%
rename from freemocap-ui/src/views/prod/SetupAndPreviewCamera.tsx
rename to experimental/freemocap-ui/src/views/prod/SetupAndPreviewCamera.tsx
diff --git a/freemocap-ui/src/views/prod/SetupAndPreviewView.tsx b/experimental/freemocap-ui/src/views/prod/SetupAndPreviewView.tsx
similarity index 100%
rename from freemocap-ui/src/views/prod/SetupAndPreviewView.tsx
rename to experimental/freemocap-ui/src/views/prod/SetupAndPreviewView.tsx
diff --git a/freemocap-ui/src/views/sessionWizard/SessionWizard.tsx b/experimental/freemocap-ui/src/views/sessionWizard/SessionWizard.tsx
similarity index 100%
rename from freemocap-ui/src/views/sessionWizard/SessionWizard.tsx
rename to experimental/freemocap-ui/src/views/sessionWizard/SessionWizard.tsx
diff --git a/freemocap-ui/tsconfig.json b/experimental/freemocap-ui/tsconfig.json
similarity index 100%
rename from freemocap-ui/tsconfig.json
rename to experimental/freemocap-ui/tsconfig.json
diff --git a/experimental/python_scratch/qt_drag_and_drop.py b/experimental/python_scratch/qt_drag_and_drop.py
new file mode 100644
index 00000000..e5a60912
--- /dev/null
+++ b/experimental/python_scratch/qt_drag_and_drop.py
@@ -0,0 +1,32 @@
+# from -https://gist.github.com/peace098beat/db8ef7161508e6500ebe?permalink_comment_id=3542714#gistcomment-3542714
+
+from PyQt6.QtWidgets import QMainWindow, QApplication
+
+
+import sys
+
+
+class MainWidget(QMainWindow):
+ def __init__(self):
+ super().__init__()
+ self.setWindowTitle("Drag and Drop")
+ self.resize(720, 480)
+ self.setAcceptDrops(True)
+
+ def dragEnterEvent(self, event):
+ if event.mimeData().hasUrls():
+ event.accept()
+ else:
+ event.ignore()
+
+ def dropEvent(self, event):
+ files = [u.toLocalFile() for u in event.mimeData().urls()]
+ for f in files:
+ print(f)
+
+
+if __name__ == "__main__":
+ app = QApplication(sys.argv)
+ ui = MainWidget()
+ ui.show()
+ sys.exit(app.exec())
diff --git a/experimental/tool_bar.py b/experimental/tool_bar.py
new file mode 100644
index 00000000..fbca8f58
--- /dev/null
+++ b/experimental/tool_bar.py
@@ -0,0 +1,44 @@
+from PyQt6.QtCore import Qt
+from PyQt6.QtWidgets import QToolBar, QWidget
+
+from freemocap.gui.qt.widgets.control_panel.calibration_control_panel import CalibrationControlPanel
+from freemocap.gui.qt.widgets.control_panel.process_mocap_data_panel.process_motion_capture_data_panel import (
+ ProcessMotionCaptureDataPanel,
+)
+
+
+class ToolBar(QToolBar):
+ def __init__(
+ self,
+ calibration_control_panel: CalibrationControlPanel,
+ process_motion_capture_data_panel: ProcessMotionCaptureDataPanel,
+ visualize_data_widget: QWidget,
+ directory_view_widget: QWidget,
+ parent=None,
+ ):
+ super().__init__(parent=parent)
+
+ self._calibration_control_panel = calibration_control_panel
+ self._process_motion_capture_data_panel = process_motion_capture_data_panel
+ self._visualize_data_widget = visualize_data_widget
+ self._directory_view_widget = directory_view_widget
+
+ self.setMovable(True)
+ self.setFloatable(True)
+ self.setAllowedAreas(Qt.ToolBarArea.AllToolBarAreas)
+
+ self._create_toolbar_actions()
+ self._create_tool_bar()
+
+ def _create_tool_bar(self):
+ self.addAction(self._open_directory_action)
+
+ def _create_toolbar_actions(self):
+ self._open_directory_action = self.addAction("Open Directory")
+ self._open_directory_action.triggered.connect(self._open_directory_widget)
+
+ def _open_directory_widget(self):
+ self._directory_view_widget.show()
+
+ # self._directory_view_dock_widget.raise_()
+ # self._directory_view_dock_widget.activateWindow()
diff --git a/freemocap/__init__.py b/freemocap/__init__.py
new file mode 100644
index 00000000..acf48dd2
--- /dev/null
+++ b/freemocap/__init__.py
@@ -0,0 +1,27 @@
+"""Top-level package for freemocap"""
+
+__author__ = """Skelly FreeMoCap"""
+__email__ = "[email protected]"
+__version__ = "v1.0.0-rc"
+__description__ = "A free and open source markerless motion capture system for everyone πŸ’€βœ¨"
+
+
+__package_name__ = "freemocap"
+__repo_url__ = f"https://github.com/freemocap/{__package_name__}/"
+__repo_issues_url__ = f"{__repo_url__}issues"
+
+
+import sys
+from pathlib import Path
+
+base_package_path = Path(__file__).parent.parent
+print(f"adding base_package_path: {base_package_path} : to sys.path")
+sys.path.insert(0, str(base_package_path)) # add par
+
+from freemocap.system.logging.configure_logging import configure_logging
+
+configure_logging()
+import logging
+
+logger = logging.getLogger(__name__)
+logger.info(f"Initializing {__package_name__} package, version: {__version__}, from file: {__file__}")
diff --git a/freemocap/__main__.py b/freemocap/__main__.py
new file mode 100644
index 00000000..1f778eb4
--- /dev/null
+++ b/freemocap/__main__.py
@@ -0,0 +1,32 @@
+# __main__.py
+import sys
+from pathlib import Path
+
+
+try:
+ from freemocap.gui.qt.freemocap_main import qt_gui_main
+except Exception as e:
+ base_package_path = Path(__file__).parent.parent
+ print(f"adding base_package_path: {base_package_path} : to sys.path")
+ sys.path.insert(0, str(base_package_path)) # add parent directory to sys.path
+ from freemocap.gui.qt.freemocap_main import qt_gui_main
+
+
+def main():
+ qt_gui_main()
+
+
+if __name__ == "__main__":
+
+ print(f"Running `freemocap.__main__` from - {__file__}")
+
+
+ # set up so you can change the taskbar icon - https://stackoverflow.com/a/74531530/14662833
+ import ctypes
+ import freemocap
+
+ if sys.platform == "win32":
+ myappid = f"{freemocap.__package_name__}_{freemocap.__version__}" # arbitrary string
+ ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(myappid)
+
+ main()
diff --git a/src/api/models/__init__.py b/freemocap/core_processes/__init__.py
similarity index 100%
rename from src/api/models/__init__.py
rename to freemocap/core_processes/__init__.py
diff --git a/src/api/routes/camera/__init__.py b/freemocap/core_processes/capture_volume_calibration/__init__.py
similarity index 100%
rename from src/api/routes/camera/__init__.py
rename to freemocap/core_processes/capture_volume_calibration/__init__.py
diff --git a/src/api/routes/health/__init__.py b/freemocap/core_processes/capture_volume_calibration/anipose_camera_calibration/__init__.py
similarity index 100%
rename from src/api/routes/health/__init__.py
rename to freemocap/core_processes/capture_volume_calibration/anipose_camera_calibration/__init__.py
diff --git a/src/core_processes/capture_volume_calibration/anipose_camera_calibration/anipose_camera_calibrator.py b/freemocap/core_processes/capture_volume_calibration/anipose_camera_calibration/anipose_camera_calibrator.py
similarity index 52%
rename from src/core_processes/capture_volume_calibration/anipose_camera_calibration/anipose_camera_calibrator.py
rename to freemocap/core_processes/capture_volume_calibration/anipose_camera_calibration/anipose_camera_calibrator.py
index 042d6c57..9a0549a7 100644
--- a/src/core_processes/capture_volume_calibration/anipose_camera_calibration/anipose_camera_calibrator.py
+++ b/freemocap/core_processes/capture_volume_calibration/anipose_camera_calibration/anipose_camera_calibrator.py
@@ -1,18 +1,18 @@
import logging
from pathlib import Path
-from typing import Union, Callable
+from typing import Callable, Union
import numpy as np
+from aniposelib.boards import CharucoBoard as AniposeCharucoBoard
-from src.config.home_dir import (
- get_freemocap_data_folder_path,
+from freemocap.system.paths_and_files_names import (
+ get_calibrations_folder_path,
+ get_last_successful_calibration_toml_path, create_camera_calibration_file_name,
)
-from src.core_processes.capture_volume_calibration.anipose_camera_calibration import (
+from freemocap.core_processes.capture_volume_calibration.anipose_camera_calibration import (
freemocap_anipose,
)
-from aniposelib.boards import CharucoBoard as AniposeCharucoBoard
-
-from src.core_processes.capture_volume_calibration.charuco_board_detection.dataclasses.charuco_board_definition import (
+from freemocap.core_processes.capture_volume_calibration.charuco_stuff.charuco_board_definition import (
CharucoBoardDefinition,
)
@@ -26,20 +26,18 @@ class AniposeCameraCalibrator:
charuco_square_size: Union[int, float],
calibration_videos_folder_path: Union[str, Path],
progress_callback: Callable[[str], None] = None,
- session_id: str = None,
):
self._charuco_board_object = charuco_board_object
self._progress_callback = progress_callback
- self._session_id = session_id
if charuco_square_size == 1:
logger.warning(
"Charuco square size is not set, so units of 3d reconstructed data will be in units of `however_long_the_black_edge_of_the_charuco_square_was`. Please input `charuco_square_size` in millimeters (or your preferred unity of length)"
)
self._charuco_square_size = charuco_square_size
- self._calibration_videos_folder_path = calibration_videos_folder_path
- self._session_folder_path = Path(self._calibration_videos_folder_path).parent
+ self._calibration_videos_folder_path = Path(calibration_videos_folder_path)
+ self._recording_folder_path = Path(self._calibration_videos_folder_path).parent
self._get_video_paths()
self._initialize_anipose_objects()
@@ -47,31 +45,20 @@ class AniposeCameraCalibrator:
self,
):
self._list_of_video_paths = [
- this_video_path
- for this_video_path in Path(self._calibration_videos_folder_path).glob(
- "*.mp4".lower()
- )
+ this_video_path for this_video_path in Path(self._calibration_videos_folder_path).glob("*.mp4".lower())
]
def _initialize_anipose_objects(self):
- list_of_camera_names = [
- this_video_path.stem for this_video_path in self._list_of_video_paths
- ]
- self._anipose_camera_group_object = freemocap_anipose.CameraGroup.from_names(
- list_of_camera_names
- )
+ list_of_camera_names = [this_video_path.stem for this_video_path in self._list_of_video_paths]
+ self._anipose_camera_group_object = freemocap_anipose.CameraGroup.from_names(list_of_camera_names)
# add metadata
- self._anipose_camera_group_object.metadata[
- "charuco_square_size"
- ] = self._charuco_square_size
- self._anipose_camera_group_object.metadata["charuco_board_object"] = str(
- self._charuco_board_object
- )
-
- self._anipose_camera_group_object.metadata["charuco_board_object"] = str(
- self._session_id
+ self._anipose_camera_group_object.metadata["charuco_square_size"] = self._charuco_square_size
+ self._anipose_camera_group_object.metadata["charuco_board_object"] = str(self._charuco_board_object)
+ self._anipose_camera_group_object.metadata["path_to_recorded_videos"] = str(
+ self._calibration_videos_folder_path
)
+ self._anipose_camera_group_object.metadata["date_time_calibrated"] = str(np.datetime64("now"))
self._anipose_charuco_board = AniposeCharucoBoard(
self._charuco_board_object.number_of_squares_width,
@@ -83,16 +70,10 @@ class AniposeCameraCalibrator:
)
def calibrate_camera_capture_volume(self, pin_camera_0_to_origin: bool = False):
- # anipose needs this to be a list of lists (which is annoying but whatevs)
- video_paths_list_of_list_of_strings = [
- [str(this_path)] for this_path in self._list_of_video_paths
- ]
- (
- error,
- charuco_frame_data,
- charuco_frame_numbers,
- ) = self._anipose_camera_group_object.calibrate_videos(
+ video_paths_list_of_list_of_strings = [[str(this_path)] for this_path in self._list_of_video_paths]
+
+ (error, charuco_frame_data, charuco_frame_numbers,) = self._anipose_camera_group_object.calibrate_videos(
video_paths_list_of_list_of_strings, self._anipose_charuco_board
)
success_str = "Anipose Calibration Successful!"
@@ -100,45 +81,27 @@ class AniposeCameraCalibrator:
self._progress_callback(success_str)
if pin_camera_0_to_origin:
# translate cameras so camera0 is on `0,0,0`
- self._anipose_camera_group_object = self.pin_camera_zero_to_origin(
- self._anipose_camera_group_object
- )
+ self._anipose_camera_group_object = self.pin_camera_zero_to_origin(self._anipose_camera_group_object)
# self._anipose_camera_group_object = self.rotate_cameras_so_camera_zero_aligns_with_XYZ(self._anipose_camera_group_object)
# save calibration info to files
- calibration_toml_filename = f"camera_calibration_data.toml"
- camera_calibration_toml_path = (
- self._session_folder_path / calibration_toml_filename
- )
+ calibration_toml_filename = create_camera_calibration_file_name(recording_name = self._calibration_videos_folder_path.parent.stem)
- self._anipose_camera_group_object.dump(camera_calibration_toml_path)
- logger.info(
- f"anipose camera calibration data saved to {str(camera_calibration_toml_path)}"
- )
+ calibration_folder_toml_path = Path(get_calibrations_folder_path()) / calibration_toml_filename
- last_successful_calibration_path = Path(
- get_freemocap_data_folder_path(), "last_successful_calibration.toml"
- )
- self._anipose_camera_group_object.dump(last_successful_calibration_path)
+ self._anipose_camera_group_object.dump(calibration_folder_toml_path)
+ logger.info(f"anipose camera calibration data saved to Calibrations folder - {str(calibration_folder_toml_path)}")
- logger.info(
- f"anipose camera calibration data also saved to {str(last_successful_calibration_path)}"
- )
+ recording_folder_toml_path = Path(self._recording_folder_path) / calibration_toml_filename
+
+ self._anipose_camera_group_object.dump(recording_folder_toml_path)
+ logger.info(f"anipose camera calibration data saved to Recording folder - {str(recording_folder_toml_path)}")
+
+ last_successful_calibration_toml_path = get_last_successful_calibration_toml_path()
+ self._anipose_camera_group_object.dump(last_successful_calibration_toml_path)
+
+ logger.info(f"anipose camera calibration data also saved to 'Last Successful Calibration' - {last_successful_calibration_toml_path}")
- return self._anipose_camera_group_object
- # # convert charuco data into a format that can be 3d reconstructed (effectively providing dummy data for the rest of the 3d reconstruction pipeline)
- # self.charuco_nCams_nFrames_nImgPts_XY = np.empty(
- # [self.multi_cam.num_cams, self.multi_cam.num_frames, num_charuco_tracked_points, 2])
- # self.charuco_nCams_nFrames_nImgPts_XY[:] = np.nan
- #
- # for this_charuco_frame_data, this_charuco_frame_num in zip(charuco_frame_data, charuco_frame_numbers):
- # for this_cam_num in range(self.multi_cam.num_cams):
- # try:
- # self.charuco_nCams_nFrames_nImgPts_XY[this_cam_num, this_charuco_frame_num, :, :] = np.squeeze(
- # this_charuco_frame_data[this_cam_num]["filled"])
- # except:
- # # print("failed frame:", frame)
- # continue
def pin_camera_zero_to_origin(self, _anipose_camera_group_object):
original_translation_vectors = _anipose_camera_group_object.get_translations()
@@ -146,20 +109,15 @@ class AniposeCameraCalibrator:
altered_translation_vectors = np.zeros(original_translation_vectors.shape)
for this_camera_number in range(original_translation_vectors.shape[0]):
altered_translation_vectors[this_camera_number, :] = (
- original_translation_vectors[this_camera_number, :]
- - camera_0_translation
+ original_translation_vectors[this_camera_number, :] - camera_0_translation
)
_anipose_camera_group_object.set_translations(altered_translation_vectors)
logger.info(f"original translation vectors:\n {original_translation_vectors}")
- logger.info(
- f"altered translation vectors:\n {_anipose_camera_group_object.get_translations()}"
- )
+ logger.info(f"altered translation vectors:\n {_anipose_camera_group_object.get_translations()}")
return _anipose_camera_group_object
- def rotate_cameras_so_camera_zero_aligns_with_XYZ(
- self, _anipose_camera_group_object
- ):
+ def rotate_cameras_so_camera_zero_aligns_with_XYZ(self, _anipose_camera_group_object):
logger.warning("this function does not work, dont use it lol ")
pass
# original_rotations_euler = _anipose_camera_group_object.get_rotations()
diff --git a/src/core_processes/capture_volume_calibration/anipose_camera_calibration/freemocap_anipose.py b/freemocap/core_processes/capture_volume_calibration/anipose_camera_calibration/freemocap_anipose.py
similarity index 90%
rename from src/core_processes/capture_volume_calibration/anipose_camera_calibration/freemocap_anipose.py
rename to freemocap/core_processes/capture_volume_calibration/anipose_camera_calibration/freemocap_anipose.py
index 233f6ba4..a8897794 100644
--- a/src/core_processes/capture_volume_calibration/anipose_camera_calibration/freemocap_anipose.py
+++ b/freemocap/core_processes/capture_volume_calibration/anipose_camera_calibration/freemocap_anipose.py
@@ -1,33 +1,33 @@
# Most of this was copied (with permission) from the original `aniposelib` package (https://github.com/lambdaloop/aniposelib), and we're adapting it to our needs here. M
# ore info on Anipoise: https://anipose.readthedocs.io/en/latest/
+import itertools
import logging
+import multiprocessing
+import time
+from collections import defaultdict
+from copy import copy
import cv2
import numpy as np
-from copy import copy
-from scipy.sparse import lil_matrix, dok_matrix
-from scipy import optimize
-from scipy import signal
-from numba import jit
-from collections import defaultdict, Counter
import toml
-import itertools
-from tqdm import trange
-from rich import print
-import time
-
-
from aniposelib.boards import (
- merge_rows,
extract_points,
extract_rtvecs,
get_video_params,
+ merge_rows,
)
-from aniposelib.utils import get_initial_extrinsics, make_M, get_rtvec, get_connections
+from aniposelib.utils import get_connections, get_initial_extrinsics, get_rtvec, make_M
+from numba import jit
+from scipy import optimize
+from scipy import signal
+from scipy.sparse import dok_matrix
+from tqdm import trange
numba_logger = logging.getLogger("numba")
-numba_logger.setLevel(logging.INFO)
+numba_logger.setLevel(logging.WARNING)
+
+logger = logging.getLogger(__name__)
@jit(nopython=True, parallel=True)
@@ -104,10 +104,7 @@ def resample_points_extra(imgp, extra, n_samp=25):
for board_id in best_boards[:, cam_num]:
include.update(ixs[ids == board_id])
cam_totals += cam_counts[board_id]
- if (
- cam_totals[cam_num] >= n_samp
- or cam_counts_random[board_id, cam_num] < 1
- ):
+ if cam_totals[cam_num] >= n_samp or cam_counts_random[board_id, cam_num] < 1:
break
final_ixs = sorted(include)
@@ -187,9 +184,7 @@ def transform_points(points, rvecs, tvecs):
cos_theta = np.cos(theta)
sin_theta = np.sin(theta)
- rotated = (
- cos_theta * points + sin_theta * np.cross(v, points) + dot * (1 - cos_theta) * v
- )
+ rotated = cos_theta * points + sin_theta * np.cross(v, points) + dot * (1 - cos_theta) * v
return rotated + tvecs
@@ -340,9 +335,7 @@ class Camera:
def undistort_points(self, points):
shape = points.shape
points = points.reshape(-1, 1, 2)
- out = cv2.undistortPoints(
- points, self.matrix.astype("float64"), self.dist.astype("float64")
- )
+ out = cv2.undistortPoints(points, self.matrix.astype("float64"), self.dist.astype("float64"))
return out.reshape(shape)
def project(self, points):
@@ -358,9 +351,7 @@ class Camera:
def single_camera_reprojection_error(self, p3d, p2d):
projecting_3d_points_onto_2d_image_plane_og = self.project(p3d)
- projecting_3d_points_onto_2d_image_plane = (
- projecting_3d_points_onto_2d_image_plane_og.reshape(p2d.shape)
- )
+ projecting_3d_points_onto_2d_image_plane = projecting_3d_points_onto_2d_image_plane_og.reshape(p2d.shape)
return p2d - projecting_3d_points_onto_2d_image_plane
def copy(self):
@@ -491,9 +482,7 @@ class CameraGroup:
indices = []
for name in names:
if name not in cur_names_dict:
- raise IndexError(
- "name {} not part of camera names: {}".format(name, cur_names)
- )
+ raise IndexError("name {} not part of camera names: {}".format(name, cur_names))
indices.append(cur_names_dict[name])
return self.subset_cameras(indices)
@@ -510,15 +499,14 @@ class CameraGroup:
return out
- def triangulate(self, points, undistort=True, progress=False):
+ def triangulate(self, points, undistort=True, progress=False, kill_event:multiprocessing.Event=None):
"""Given an CxNx2 array, this returns an Nx3 array of points,
where N is the number of points and C is the number of cameras"""
- assert points.shape[0] == len(self.cameras), (
- "Invalid points shape, first dim should be equal to"
- " number of cameras ({}), but shape is {}".format(
- len(self.cameras), points.shape
- )
+ assert points.shape[0] == len(
+ self.cameras
+ ), "Invalid points shape, first dim should be equal to" " number of cameras ({}), but shape is {}".format(
+ len(self.cameras), points.shape
)
one_point = False
@@ -552,14 +540,15 @@ class CameraGroup:
if np.sum(good) >= 2:
out[ip] = triangulate_simple(subp[good], cam_mats[good])
+ if kill_event is not None and kill_event.is_set():
+ return None
+
if one_point:
out = out[0]
return out
- def triangulate_possible(
- self, points, undistort=True, min_cams=2, progress=False, threshold=0.5
- ):
+ def triangulate_possible(self, points, undistort=True, min_cams=2, progress=False, threshold=0.5, kill_event:multiprocessing.Event=None):
"""Given an CxNxPx2 array, this returns an Nx3 array of points
by triangulating all possible points and picking the ones with
best reprojection error
@@ -569,11 +558,10 @@ class CameraGroup:
P: number of possible options per point
"""
- assert points.shape[0] == len(self.cameras), (
- "Invalid points shape, first dim should be equal to"
- " number of cameras ({}), but shape is {}".format(
- len(self.cameras), points.shape
- )
+ assert points.shape[0] == len(
+ self.cameras
+ ), "Invalid points shape, first dim should be equal to" " number of cameras ({}), but shape is {}".format(
+ len(self.cameras), points.shape
)
n_cams, n_points, n_possible, _ = points.shape
@@ -582,9 +570,7 @@ class CameraGroup:
all_iters = defaultdict(dict)
- for cam_num, point_num, possible_num in zip(
- cam_nums, point_nums, possible_nums
- ):
+ for cam_num, point_num, possible_num in zip(cam_nums, point_nums, possible_nums):
if cam_num not in all_iters[point_num]:
all_iters[point_num][cam_num] = []
all_iters[point_num][cam_num].append((cam_num, possible_num))
@@ -614,6 +600,9 @@ class CameraGroup:
if len(picked) < min_cams and len(picked) != n_cams_max:
continue
+ if kill_event is not None and kill_event.is_set():
+ return None
+
cnums = [p[0] for p in picked]
xnums = [p[1] for p in picked]
@@ -647,24 +636,21 @@ class CameraGroup:
# return out, picked_vals, points_2d, errors #original code from OG anipose
return out # simplify output so that `triangulate_ransac` can be used exactly the same way as `triangulate`
- def triangulate_ransac(self, points, undistort=True, min_cams=2, progress=False):
+ def triangulate_ransac(self, points, undistort=True, min_cams=2, progress=False, kill_event:multiprocessing.Event=None):
"""Given an CxNx2 array, this returns an Nx3 array of points,
where N is the number of points and C is the number of cameras"""
- assert points.shape[0] == len(self.cameras), (
- "Invalid points shape, first dim should be equal to"
- " number of cameras ({}), but shape is {}".format(
- len(self.cameras), points.shape
- )
+ assert points.shape[0] == len(
+ self.cameras
+ ), "Invalid points shape, first dim should be equal to" " number of cameras ({}), but shape is {}".format(
+ len(self.cameras), points.shape
)
n_cams, n_points, _ = points.shape
points_ransac = points.reshape(n_cams, n_points, 1, 2)
- return self.triangulate_possible(
- points_ransac, undistort=undistort, min_cams=min_cams, progress=progress
- )
+ return self.triangulate_possible(points_ransac, undistort=undistort, min_cams=min_cams, progress=progress, kill_event=kill_event)
@jit(parallel=True, forceobj=True)
def reprojection_error(self, p3ds, p2ds, mean=False):
@@ -683,9 +669,7 @@ class CameraGroup:
assert p3ds.shape == (
n_points,
3,
- ), "shapes of 2D and 3D points are not consistent: " "2D={}, 3D={}".format(
- p2ds.shape, p3ds.shape
- )
+ ), "shapes of 2D and 3D points are not consistent: " "2D={}, 3D={}".format(p2ds.shape, p3ds.shape)
errors = np.empty((n_cams, n_points, 2))
@@ -731,11 +715,10 @@ class CameraGroup:
"""
error_list = []
- assert p2ds.shape[0] == len(self.cameras), (
- "Invalid points shape, first dim should be equal to"
- " number of cameras ({}), but shape is {}".format(
- len(self.cameras), p2ds.shape
- )
+ assert p2ds.shape[0] == len(
+ self.cameras
+ ), "Invalid points shape, first dim should be equal to" " number of cameras ({}), but shape is {}".format(
+ len(self.cameras), p2ds.shape
)
p2ds_full = p2ds
@@ -769,9 +752,7 @@ class CameraGroup:
good = errors_norm < mu
extra_good = subset_extra(extra, good)
- p2ds_samp, extra_samp = resample_points(
- p2ds[:, good], extra_good, n_samp=n_samp_iter
- )
+ p2ds_samp, extra_samp = resample_points(p2ds[:, good], extra_good, n_samp=n_samp_iter)
error = np.median(errors_norm)
error_list.append(error)
@@ -781,11 +762,7 @@ class CameraGroup:
if verbose:
print(error_dict)
- print(
- "error: {:.2f}, mu: {:.1f}, ratio: {:.3f}".format(
- error, mu, np.mean(good)
- )
- )
+ print("error: {:.2f}, mu: {:.1f}, ratio: {:.3f}".format(error, mu, np.mean(good)))
print(f"previous error scores: [magenta] {error_list}[/magenta]")
self.bundle_adjust(
@@ -853,11 +830,10 @@ class CameraGroup:
where N is the number of points and C is the number of cameras,
this performs bundle adjustsment to fine-tune the parameters of the cameras"""
- assert p2ds.shape[0] == len(self.cameras), (
- "Invalid points shape, first dim should be equal to"
- " number of cameras ({}), but shape is {}".format(
- len(self.cameras), p2ds.shape
- )
+ assert p2ds.shape[0] == len(
+ self.cameras
+ ), "Invalid points shape, first dim should be equal to" " number of cameras ({}), but shape is {}".format(
+ len(self.cameras), p2ds.shape
)
if extra is not None:
@@ -1024,8 +1000,7 @@ class CameraGroup:
n_cams, n_points, _ = p2ds.shape
assert n_cams == len(self.cameras), (
- "number of cameras in CameraGroup does not "
- "match number of cameras in 2D points given"
+ "number of cameras in CameraGroup does not " "match number of cameras in 2D points given"
)
p3ds = self.triangulate(p2ds)
@@ -1047,9 +1022,7 @@ class CameraGroup:
cam_ids_possible = np.where(~np.isnan(p2ds[:, point_id, 0]))[0]
cam_id = np.random.choice(cam_ids_possible)
M_cam = self.cameras[cam_id].get_extrinsics_mat()
- M_board_cam = make_M(
- rvecs_all[cam_id, point_id], tvecs_all[cam_id, point_id]
- )
+ M_board_cam = make_M(rvecs_all[cam_id, point_id], tvecs_all[cam_id, point_id])
M_board = np.matmul(np.linalg.inv(M_cam), M_board_cam)
rvec, tvec = get_rtvec(M_board)
rvecs[board_num] = rvec
@@ -1100,11 +1073,10 @@ class CameraGroup:
(meaning that lengths of segments 0->1, 1->2, 2->3 are all constant)
"""
- assert points.shape[0] == len(self.cameras), (
- "Invalid points shape, first dim should be equal to"
- " number of cameras ({}), but shape is {}".format(
- len(self.cameras), points.shape
- )
+ assert points.shape[0] == len(
+ self.cameras
+ ), "Invalid points shape, first dim should be equal to" " number of cameras ({}), but shape is {}".format(
+ len(self.cameras), points.shape
)
n_cams, n_frames, n_joints, _ = points.shape
@@ -1120,15 +1092,11 @@ class CameraGroup:
t1 = time.time()
- x0 = self._initialize_params_triangulation(
- p3ds_intp, constraints, constraints_weak
- )
+ x0 = self._initialize_params_triangulation(p3ds_intp, constraints, constraints_weak)
x0[~np.isfinite(x0)] = 0
- jac = self._jac_sparsity_triangulation(
- points, constraints, constraints_weak, n_deriv_smooth
- )
+ jac = self._jac_sparsity_triangulation(points, constraints, constraints_weak, n_deriv_smooth)
opt2 = optimize.least_squares(
self._error_fun_triangulation,
@@ -1192,11 +1160,10 @@ class CameraGroup:
(meaning that lengths of segments 0->1, 1->2, 2->3 are all constant)
"""
- assert points.shape[0] == len(self.cameras), (
- "Invalid points shape, first dim should be equal to"
- " number of cameras ({}), but shape is {}".format(
- len(self.cameras), points.shape
- )
+ assert points.shape[0] == len(
+ self.cameras
+ ), "Invalid points shape, first dim should be equal to" " number of cameras ({}), but shape is {}".format(
+ len(self.cameras), points.shape
)
n_cams, n_frames, n_joints, n_possible, _ = points.shape
@@ -1277,9 +1244,7 @@ class CameraGroup:
return p3ds_new2, alphas_norm
- def triangulate_optim(
- self, points, init_ransac=False, init_progress=False, **kwargs
- ):
+ def triangulate_optim(self, points, init_ransac=False, init_progress=False, **kwargs):
"""
Take in an array of 2D points of shape CxNxJx2, and an array of constraints of shape Kx2, where
C: number of camera
@@ -1295,11 +1260,10 @@ class CameraGroup:
"""
- assert points.shape[0] == len(self.cameras), (
- "Invalid points shape, first dim should be equal to"
- " number of cameras ({}), but shape is {}".format(
- len(self.cameras), points.shape
- )
+ assert points.shape[0] == len(
+ self.cameras
+ ), "Invalid points shape, first dim should be equal to" " number of cameras ({}), but shape is {}".format(
+ len(self.cameras), points.shape
)
n_cams, n_frames, n_joints, _ = points.shape
@@ -1308,9 +1272,7 @@ class CameraGroup:
points_shaped = points.reshape(n_cams, n_frames * n_joints, 2)
if init_ransac:
- p3ds, picked, p2ds, errors = self.triangulate_ransac(
- points_shaped, progress=init_progress
- )
+ p3ds, picked, p2ds, errors = self.triangulate_ransac(points_shaped, progress=init_progress)
points = p2ds.reshape(points.shape)
else:
p3ds = self.triangulate(points_shaped, progress=init_progress)
@@ -1318,9 +1280,7 @@ class CameraGroup:
c = np.isfinite(p3ds[:, :, 0])
if np.sum(c) < 20:
- print(
- "warning: not enough 3D points to calculate_center_of_mass optimization"
- )
+ print("warning: not enough 3D points to calculate_center_of_mass optimization")
return p3ds
return self.optim_points(points, p3ds, **kwargs)
@@ -1388,13 +1348,9 @@ class CameraGroup:
errors_lengths_weak[cix] = 100 * (lengths - expected) / expected
errors_lengths_weak = errors_lengths_weak.ravel() * scale_length_weak
- return np.hstack(
- [errors_reproj, errors_smooth, errors_lengths, errors_lengths_weak]
- )
+ return np.hstack([errors_reproj, errors_smooth, errors_lengths, errors_lengths_weak])
- def _error_fun_triangulation_possible(
- self, params, p2ds, beta=2, constraints=[], constraints_weak=[], *args
- ):
+ def _error_fun_triangulation_possible(self, params, p2ds, beta=2, constraints=[], constraints_weak=[], *args):
# extract alphas from end of params
# soft argmax for picking the appropriate points from p2ds
# pass the points to error_fun_triangulate_possible for residuals
@@ -1429,18 +1385,14 @@ class CameraGroup:
p2ds_adj = np.sum(alphas_norm[:, :, :, :, None] * p2ds_test, axis=3)
p2ds_adj[all_bad] = np.nan
- errors = self._error_fun_triangulation(
- params_rest, p2ds_adj, constraints, constraints_weak, *args
- )
+ errors = self._error_fun_triangulation(params_rest, p2ds_adj, constraints, constraints_weak, *args)
alphas_test = alphas_norm[~all_bad]
errors_alphas = (1 - np.std(alphas_test, axis=1)) * 10
return np.hstack([errors, errors_alphas])
- def _initialize_params_triangulation(
- self, p3ds, constraints=[], constraints_weak=[]
- ):
+ def _initialize_params_triangulation(self, p3ds, constraints=[], constraints_weak=[]):
joint_lengths = np.empty(len(constraints), dtype="float64")
joint_lengths_weak = np.empty(len(constraints_weak), dtype="float64")
@@ -1481,9 +1433,7 @@ class CameraGroup:
return params_full
- def _jac_sparsity_triangulation(
- self, p2ds, constraints=[], constraints_weak=[], n_deriv_smooth=1
- ):
+ def _jac_sparsity_triangulation(self, p2ds, constraints=[], constraints_weak=[], n_deriv_smooth=1):
n_cams, n_frames, n_joints, _ = p2ds.shape
n_constraints = len(constraints)
n_constraints_weak = len(constraints_weak)
@@ -1502,9 +1452,7 @@ class CameraGroup:
n_errors_lengths = n_constraints * n_frames
n_errors_lengths_weak = n_constraints_weak * n_frames
- n_errors = (
- n_errors_reproj + n_errors_smooth + n_errors_lengths + n_errors_lengths_weak
- )
+ n_errors = n_errors_reproj + n_errors_smooth + n_errors_lengths + n_errors_lengths_weak
n_3d = n_frames * n_joints * 3
n_params = n_3d + n_constraints + n_constraints_weak
@@ -1578,22 +1526,16 @@ class CameraGroup:
n_errors, n_params = A_sparse.shape
- B_sparse = dok_matrix(
- (n_errors + n_errors_alphas, n_params + n_alphas), dtype="int16"
- )
+ B_sparse = dok_matrix((n_errors + n_errors_alphas, n_params + n_alphas), dtype="int16")
for r, c in zip(*A_sparse.nonzero()):
B_sparse[r, c] = A_sparse[r, c]
- point_indices_2d = np.arange(n_cams * n_frames * n_joints).reshape(
- n_cams, n_frames, n_joints
- )
+ point_indices_2d = np.arange(n_cams * n_frames * n_joints).reshape(n_cams, n_frames, n_joints)
point_indices_2d_rep = np.repeat(point_indices_2d[:, :, :, None], 2, axis=3)
point_indices_2d_good = point_indices_2d_rep[~np.isnan(p2ds)]
point_indices_good = point_indices_2d[any_good]
- alpha_indices = np.zeros(
- (n_cams, n_frames, n_joints, n_possible), dtype="int64"
- )
+ alpha_indices = np.zeros((n_cams, n_frames, n_joints, n_possible), dtype="int64")
for pnum in range(n_possible):
alpha_indices[:, :, :, pnum] = point_indices_2d
@@ -1670,25 +1612,17 @@ class CameraGroup:
verbose=True,
**kwargs,
):
- assert len(all_rows) == len(
- self.cameras
- ), "Number of camera detections does not match number of cameras"
+ assert len(all_rows) == len(self.cameras), "Number of camera detections does not match number of cameras"
for rows, camera in zip(all_rows, self.cameras):
size = camera.get_size()
- assert (
- size is not None
- ), "Camera with name {} has no specified frame size".format(
- camera.get_name()
- )
+ assert size is not None, "Camera with name {} has no specified frame size".format(camera.get_name())
if init_intrinsics:
objp, imgp = board.get_all_calibration_points(rows)
mixed = [(o, i) for (o, i) in zip(objp, imgp) if len(o) >= 7]
- assert (
- len(objp) != 0 and len(imgp) != 0
- ), "No Charuco board points detected"
+ assert len(objp) != 0 and len(imgp) != 0, "No Charuco board points detected"
objp, imgp = zip(*mixed)
matrix = cv2.initCameraMatrix2D(objp, imgp, tuple(size))
camera.set_camera_matrix(matrix)
diff --git a/freemocap/core_processes/capture_volume_calibration/anipose_camera_calibration/get_anipose_calibration_object.py b/freemocap/core_processes/capture_volume_calibration/anipose_camera_calibration/get_anipose_calibration_object.py
new file mode 100644
index 00000000..aae821a7
--- /dev/null
+++ b/freemocap/core_processes/capture_volume_calibration/anipose_camera_calibration/get_anipose_calibration_object.py
@@ -0,0 +1,61 @@
+import filecmp
+import logging
+import shutil
+from pathlib import Path
+from typing import Union
+
+from freemocap.system.paths_and_files_names import (
+ get_last_successful_calibration_toml_path,
+)
+from freemocap.core_processes.capture_volume_calibration.anipose_camera_calibration import (
+ freemocap_anipose,
+)
+
+logger = logging.getLogger(__name__)
+
+
+def load_most_recent_anipose_calibration_toml(save_copy_of_calibration_to_this_path: Union[str, Path] = None):
+ most_recent_calibration_toml_path = get_last_successful_calibration_toml_path()
+ logger.info(f"loading `most recent calibration from:{str(most_recent_calibration_toml_path)}")
+ if save_copy_of_calibration_to_this_path is not None:
+ logger.info(f"Saving copy of `most_recent_calibration.toml` to {save_copy_of_calibration_to_this_path}")
+
+ shutil.copy(
+ str(most_recent_calibration_toml_path),
+ str(Path(save_copy_of_calibration_to_this_path) / Path(most_recent_calibration_toml_path).name),
+ )
+
+ return freemocap_anipose.CameraGroup.load(str(most_recent_calibration_toml_path))
+
+
+def load_anipose_calibration_toml_from_path(
+ camera_calibration_data_toml_path: Union[str, Path],
+ save_copy_of_calibration_to_this_path: Union[str, Path],
+):
+ logger.info(f"loading camera calibration file from:{str(camera_calibration_data_toml_path)}")
+ try:
+ anipose_calibration_object = freemocap_anipose.CameraGroup.load(str(camera_calibration_data_toml_path))
+ copy_toml_path = str(Path(save_copy_of_calibration_to_this_path) / Path(camera_calibration_data_toml_path).name)
+
+ if Path(copy_toml_path).is_file() and\
+ not filecmp.cmp(str(camera_calibration_data_toml_path), copy_toml_path):
+ logger.info(
+ f"Saving copy of {camera_calibration_data_toml_path} to {save_copy_of_calibration_to_this_path}")
+ shutil.copyfile(str(camera_calibration_data_toml_path), copy_toml_path)
+
+ return anipose_calibration_object
+ except Exception as e:
+ logger.error(f"Failed to load anipose calibration info from {str(camera_calibration_data_toml_path)}")
+ raise e
+
+
+def load_calibration_from_session_id(
+ session_calibration_file_path: Union[str, Path],
+):
+ logger.info(f"loading camera calibration file from:{str(session_calibration_file_path)}")
+ try:
+
+ return freemocap_anipose.CameraGroup.load(str(session_calibration_file_path))
+ except Exception as e:
+ logger.error(f"Failed to load anipose calibration info from {str(session_calibration_file_path)}")
+ raise e
diff --git a/src/api/services/__init__.py b/freemocap/core_processes/capture_volume_calibration/charuco_stuff/__init__.py
similarity index 100%
rename from src/api/services/__init__.py
rename to freemocap/core_processes/capture_volume_calibration/charuco_stuff/__init__.py
diff --git a/freemocap/core_processes/capture_volume_calibration/charuco_stuff/charuco_board_definition.py b/freemocap/core_processes/capture_volume_calibration/charuco_stuff/charuco_board_definition.py
new file mode 100644
index 00000000..2db5c8fb
--- /dev/null
+++ b/freemocap/core_processes/capture_volume_calibration/charuco_stuff/charuco_board_definition.py
@@ -0,0 +1,43 @@
+from dataclasses import dataclass
+from typing import Dict
+
+import cv2
+
+
+@dataclass
+class CharucoBoardDefinition:
+ try:
+ # to make compatible across opencv 4.6 and 4.7
+ aruco_marker_dict: Dict = cv2.aruco.Dictionary_get(cv2.aruco.DICT_4X4_250)
+ except:
+ aruco_marker_dict: Dict = cv2.aruco.getPredefinedDictionary(cv2.aruco.DICT_4X4_250)
+
+ # number_of_squares_width: int = 5
+ # number_of_squares_height: int = 3
+ number_of_squares_width: int = 7
+ number_of_squares_height: int = 5
+ black_square_side_length: int = 1
+ aruco_marker_length_proportional: float = 0.8
+
+ def __post_init__(self):
+ try:
+ # opencv 4.6
+ self.charuco_board = cv2.aruco.CharucoBoard_create(
+ self.number_of_squares_width,
+ self.number_of_squares_height,
+ self.black_square_side_length,
+ self.aruco_marker_length_proportional,
+ self.aruco_marker_dict,
+ )
+ except:
+ # opencv 4.7
+ self.charuco_board = cv2.aruco.CharucoBoard(
+ size=[self.number_of_squares_width, self.number_of_squares_height],
+ squareLength=self.black_square_side_length,
+ markerLength=self.aruco_marker_length_proportional,
+ dictionary=self.aruco_marker_dict,
+ )
+
+ self.number_of_charuco_corners = (self.number_of_squares_width - 1) * (
+ self.number_of_squares_height - 1
+ )
diff --git a/src/core_processes/capture_volume_calibration/charuco_board_detection/default_charuco_square_size.py b/freemocap/core_processes/capture_volume_calibration/charuco_stuff/default_charuco_square_size.py
similarity index 100%
rename from src/core_processes/capture_volume_calibration/charuco_board_detection/default_charuco_square_size.py
rename to freemocap/core_processes/capture_volume_calibration/charuco_stuff/default_charuco_square_size.py
diff --git a/src/core_processes/capture_volume_calibration/run_anipose_capture_volume_calibration.py b/freemocap/core_processes/capture_volume_calibration/run_anipose_capture_volume_calibration.py
similarity index 58%
rename from src/core_processes/capture_volume_calibration/run_anipose_capture_volume_calibration.py
rename to freemocap/core_processes/capture_volume_calibration/run_anipose_capture_volume_calibration.py
index 01bc9df8..b5abbb0b 100644
--- a/src/core_processes/capture_volume_calibration/run_anipose_capture_volume_calibration.py
+++ b/freemocap/core_processes/capture_volume_calibration/run_anipose_capture_volume_calibration.py
@@ -1,30 +1,30 @@
from pathlib import Path
-from typing import Union, Callable
+from typing import Callable, Union
-from src.core_processes.capture_volume_calibration.anipose_camera_calibration.anipose_camera_calibrator import (
+from freemocap.core_processes.capture_volume_calibration.anipose_camera_calibration.anipose_camera_calibrator import (
AniposeCameraCalibrator,
)
-from src.core_processes.capture_volume_calibration.charuco_board_detection.dataclasses.charuco_board_definition import (
+from freemocap.core_processes.capture_volume_calibration.charuco_stuff.charuco_board_definition import (
CharucoBoardDefinition,
)
+async def async_run_anipose_capture_volume_calibration(**kwargs):
+ run_anipose_capture_volume_calibration(**kwargs)
+
+
def run_anipose_capture_volume_calibration(
charuco_board_definition: CharucoBoardDefinition,
charuco_square_size: float,
calibration_videos_folder_path: Union[str, Path],
pin_camera_0_to_origin: bool = True,
progress_callback: Callable[[str], None] = None,
- session_id=None,
):
anipose_camera_calibrator = AniposeCameraCalibrator(
charuco_board_definition,
charuco_square_size=charuco_square_size,
calibration_videos_folder_path=calibration_videos_folder_path,
- session_id=session_id,
progress_callback=progress_callback,
)
progress_callback("Endurance is great wow wow wow")
- return anipose_camera_calibrator.calibrate_camera_capture_volume(
- pin_camera_0_to_origin=pin_camera_0_to_origin
- )
+ anipose_camera_calibrator.calibrate_camera_capture_volume(pin_camera_0_to_origin=pin_camera_0_to_origin)
diff --git a/src/core_processes/capture_volume_calibration/triangulate_3d_data.py b/freemocap/core_processes/capture_volume_calibration/triangulate_3d_data.py
similarity index 81%
rename from src/core_processes/capture_volume_calibration/triangulate_3d_data.py
rename to freemocap/core_processes/capture_volume_calibration/triangulate_3d_data.py
index 41304ab1..2fa95691 100644
--- a/src/core_processes/capture_volume_calibration/triangulate_3d_data.py
+++ b/freemocap/core_processes/capture_volume_calibration/triangulate_3d_data.py
@@ -1,11 +1,12 @@
+import logging
+import multiprocessing
from pathlib import Path
from typing import Union
import numpy as np
-import logging
-from src.config.home_dir import (
- MEDIAPIPE_3D_NPY_FILE_NAME,
+from freemocap.system.paths_and_files_names import (
+ RAW_MEDIAPIPE_3D_NPY_FILE_NAME,
MEDIAPIPE_REPROJECTION_ERROR_NPY_FILE_NAME,
)
@@ -16,15 +17,11 @@ def threshold_by_confidence(
mediapipe_2d_data: np.ndarray,
mediapipe_confidence_cutoff_threshold: float = 0.0,
):
- mediapipe_2d_data[
- mediapipe_2d_data <= mediapipe_confidence_cutoff_threshold
- ] = np.NaN
+ mediapipe_2d_data[mediapipe_2d_data <= mediapipe_confidence_cutoff_threshold] = np.NaN
number_of_nans = np.sum(np.isnan(mediapipe_2d_data))
number_of_points = np.prod(mediapipe_2d_data.shape)
- percentage_that_are_nans = (
- np.sum(np.isnan(mediapipe_2d_data)) / number_of_points
- ) * 100
+ percentage_that_are_nans = (np.sum(np.isnan(mediapipe_2d_data)) / number_of_points) * 100
logger.info(
f"After thresholding `mediapipe_2d` with a confidence threshold {mediapipe_confidence_cutoff_threshold}, it has {number_of_nans} NaN values out of {number_of_points} ({percentage_that_are_nans} %)"
)
@@ -45,9 +42,7 @@ def remove_3d_data_with_high_reprojection_error(
reprojection_error_median = np.nanmedian(mean_reprojection_error_per_frame)
reprojection_error_std = np.nanstd(mean_reprojection_error_per_frame)
- median_absolute_deviation = np.nanmedian(
- np.abs(mean_reprojection_error_per_frame - reprojection_error_median)
- )
+ median_absolute_deviation = np.nanmedian(np.abs(mean_reprojection_error_per_frame - reprojection_error_median))
logger.info(
f"\nInitial reprojection error - \nmean: {reprojection_error_mean:.3f},\nstandard deviation: {reprojection_error_std:.3f},\nmedian: {reprojection_error_median}\nmedian absolute deviation: {median_absolute_deviation:.3f}"
@@ -55,18 +50,14 @@ def remove_3d_data_with_high_reprojection_error(
error_threshold = reprojection_error_median + 3 * median_absolute_deviation
- number_of_nans_before_thresholding = np.sum(
- np.isnan(data3d_numFrames_numTrackedPoints_XYZ)
- )
+ number_of_nans_before_thresholding = np.sum(np.isnan(data3d_numFrames_numTrackedPoints_XYZ))
# replace points with high reprojection error with `np.nan`
data3d_numFrames_numTrackedPoints_XYZ[
data3d_numFrames_numTrackedPoints_reprojectionError > error_threshold
] = np.nan
- number_of_nans_after_thresholding = np.sum(
- np.isnan(data3d_numFrames_numTrackedPoints_XYZ)
- )
+ number_of_nans_after_thresholding = np.sum(np.isnan(data3d_numFrames_numTrackedPoints_XYZ))
percentage_of_nans_removed = (
(number_of_nans_before_thresholding - number_of_nans_after_thresholding)
/ number_of_nans_before_thresholding
@@ -74,9 +65,7 @@ def remove_3d_data_with_high_reprojection_error(
)
logger.info(f"Removing points with reprojection error > {error_threshold:.3f}")
- logger.info(
- f"Number of NaNs before thresholding: {number_of_nans_before_thresholding}"
- )
+ logger.info(f"Number of NaNs before thresholding: {number_of_nans_before_thresholding}")
logger.info(
f"Number of NaNs after thresholding: {number_of_nans_after_thresholding} ({percentage_of_nans_removed:.2f} %)"
)
@@ -90,7 +79,9 @@ def triangulate_3d_data(
output_data_folder_path: Union[str, Path],
mediapipe_confidence_cutoff_threshold: float,
use_triangulate_ransac: bool = False,
+ kill_event : multiprocessing.Event = None,
):
+
number_of_cameras = mediapipe_2d_data.shape[0]
number_of_frames = mediapipe_2d_data.shape[1]
number_of_tracked_points = mediapipe_2d_data.shape[2]
@@ -121,25 +112,19 @@ def triangulate_3d_data(
if use_triangulate_ransac:
logger.info("Using `triangulate_ransac` method")
- data3d_flat = anipose_calibration_object.triangulate_ransac(
- data2d_flat, progress=True
- )
+ data3d_flat = anipose_calibration_object.triangulate_ransac(data2d_flat, progress=True, kill_event=kill_event)
else:
logger.info("Using simple `triangulate` method ")
- data3d_flat = anipose_calibration_object.triangulate(data2d_flat, progress=True)
+ data3d_flat = anipose_calibration_object.triangulate(data2d_flat, progress=True, kill_event=kill_event)
spatial_data3d_numFrames_numTrackedPoints_XYZ_og = data3d_flat.reshape(
number_of_frames, number_of_tracked_points, 3
)
- data3d_reprojectionError_flat = anipose_calibration_object.reprojection_error(
- data3d_flat, data2d_flat, mean=True
- )
+ data3d_reprojectionError_flat = anipose_calibration_object.reprojection_error(data3d_flat, data2d_flat, mean=True)
- reprojection_error_data3d_numFrames_numTrackedPoints = (
- data3d_reprojectionError_flat.reshape(
- number_of_frames, number_of_tracked_points
- )
+ reprojection_error_data3d_numFrames_numTrackedPoints = data3d_reprojectionError_flat.reshape(
+ number_of_frames, number_of_tracked_points
)
spatial_data3d_numFrames_numTrackedPoints_XYZ = remove_3d_data_with_high_reprojection_error(
@@ -164,23 +149,16 @@ def save_mediapipe_3d_data_to_npy(
data3d_numFrames_numTrackedPoints_reprojectionError: np.ndarray,
path_to_folder_where_data_will_be_saved: Union[str, Path],
):
- path_to_folder_where_data_will_be_saved = Path(
- path_to_folder_where_data_will_be_saved
- )
- Path(path_to_folder_where_data_will_be_saved).mkdir(
- parents=True, exist_ok=True
- ) # save spatial XYZ data
- mediapipe_3dData_save_path = (
- path_to_folder_where_data_will_be_saved / MEDIAPIPE_3D_NPY_FILE_NAME
- )
+ path_to_folder_where_data_will_be_saved = Path(path_to_folder_where_data_will_be_saved)
+ Path(path_to_folder_where_data_will_be_saved).mkdir(parents=True, exist_ok=True) # save spatial XYZ data
+ mediapipe_3dData_save_path = path_to_folder_where_data_will_be_saved / RAW_MEDIAPIPE_3D_NPY_FILE_NAME
logger.info(f"saving: {mediapipe_3dData_save_path}")
np.save(str(mediapipe_3dData_save_path), data3d_numFrames_numTrackedPoints_XYZ)
# save reprojection error
mediapipe_reprojection_error_save_path = (
- path_to_folder_where_data_will_be_saved
- / MEDIAPIPE_REPROJECTION_ERROR_NPY_FILE_NAME
+ path_to_folder_where_data_will_be_saved / MEDIAPIPE_REPROJECTION_ERROR_NPY_FILE_NAME
)
logger.info(f"saving: {mediapipe_reprojection_error_save_path}")
@@ -191,10 +169,10 @@ def save_mediapipe_3d_data_to_npy(
if __name__ == "__main__":
- import argparse
- from src.core_processes.capture_volume_calibration.get_anipose_calibration_object import (
+ from freemocap.core_processes.capture_volume_calibration.anipose_camera_calibration.get_anipose_calibration_object import (
load_anipose_calibration_toml_from_path,
)
+ import argparse
parser = argparse.ArgumentParser()
parser.add_argument(
@@ -250,13 +228,10 @@ if __name__ == "__main__":
args.use_triangulate_ransac = True
if args.calibration_file_path:
- anipose_calibration_object = load_anipose_calibration_toml_from_path(
- args.calibration_file_path
- )
+ anipose_calibration_object = load_anipose_calibration_toml_from_path(args.calibration_file_path)
else:
anipose_calibration_object = load_anipose_calibration_toml_from_path(
- Path(args.mediapipe_2d_data_path).parent.parent
- / "camera_calibration_data.toml"
+ Path(args.mediapipe_2d_data_path).parent.parent / "camera_calibration_data.toml"
)
triangulate_3d_data(
diff --git a/src/blender_stuff/__init__.py b/freemocap/core_processes/detecting_things_in_2d_images/__init__.py
similarity index 100%
rename from src/blender_stuff/__init__.py
rename to freemocap/core_processes/detecting_things_in_2d_images/__init__.py
diff --git a/src/blender_stuff/old/__init__.py b/freemocap/core_processes/detecting_things_in_2d_images/mediapipe_stuff/__init__.py
similarity index 100%
rename from src/blender_stuff/old/__init__.py
rename to freemocap/core_processes/detecting_things_in_2d_images/mediapipe_stuff/__init__.py
diff --git a/src/core_processes/mediapipe_stuff/convert_mediapipe_npy_to_csv.py b/freemocap/core_processes/detecting_things_in_2d_images/mediapipe_stuff/convert_mediapipe_npy_to_csv.py
similarity index 100%
rename from src/core_processes/mediapipe_stuff/convert_mediapipe_npy_to_csv.py
rename to freemocap/core_processes/detecting_things_in_2d_images/mediapipe_stuff/convert_mediapipe_npy_to_csv.py
diff --git a/src/core_processes/mediapipe_stuff/mediapipe_skeleton_detector.py b/freemocap/core_processes/detecting_things_in_2d_images/mediapipe_stuff/mediapipe_skeleton_detector.py
similarity index 56%
rename from src/core_processes/mediapipe_stuff/mediapipe_skeleton_detector.py
rename to freemocap/core_processes/detecting_things_in_2d_images/mediapipe_stuff/mediapipe_skeleton_detector.py
index d871923a..e14097fe 100644
--- a/src/core_processes/mediapipe_stuff/mediapipe_skeleton_detector.py
+++ b/freemocap/core_processes/detecting_things_in_2d_images/mediapipe_stuff/mediapipe_skeleton_detector.py
@@ -1,23 +1,21 @@
import logging
from dataclasses import dataclass
+import multiprocessing
from pathlib import Path
-from typing import List, Union, Any
+from typing import Any, List, Union
import cv2
-import numpy as np
import mediapipe as mp
+import numpy as np
+from skellycam.detection.models.frame_payload import FramePayload
+from skellycam.opencv.video_recorder.video_recorder import VideoRecorder
from tqdm import tqdm
-from src.cameras.capture.dataclasses.frame_payload import FramePayload
-from src.cameras.persistence.video_writer.video_recorder import VideoRecorder
-from src.config.home_dir import MEDIAPIPE_2D_NPY_FILE_NAME
-
-from src.core_processes.mediapipe_stuff.medaipipe_tracked_points_names_dict import (
+from freemocap.system.paths_and_files_names import MEDIAPIPE_2D_NPY_FILE_NAME, ANNOTATED_VIDEOS_FOLDER_NAME
+from freemocap.core_processes.detecting_things_in_2d_images.mediapipe_stuff.mediapipe_skeleton_names_and_connections import (
mediapipe_tracked_point_names_dict,
)
-from src.core_processes.batch_processing.session_processing_parameter_models import (
- MediaPipe2DParametersModel,
-)
+from freemocap.parameter_info_models.recording_processing_parameter_models import MediapipeParametersModel
logger = logging.getLogger(__name__)
@@ -43,9 +41,7 @@ class Mediapipe2dNumpyArrays:
# if there's no body data, there's no hand or face data either
return
- if (
- len(self.body2d_frameNumber_trackedPointNumber_XY.shape) == 3
- ): # multiple frames
+ if len(self.body2d_frameNumber_trackedPointNumber_XY.shape) == 3: # multiple frames
return np.hstack(
[
self.body2d_frameNumber_trackedPointNumber_XY,
@@ -54,9 +50,7 @@ class Mediapipe2dNumpyArrays:
self.face2d_frameNumber_trackedPointNumber_XY,
]
)
- elif (
- len(self.body2d_frameNumber_trackedPointNumber_XY.shape) == 2
- ): # single frame
+ elif len(self.body2d_frameNumber_trackedPointNumber_XY.shape) == 2: # single frame
return np.vstack(
[
self.body2d_frameNumber_trackedPointNumber_XY,
@@ -80,7 +74,7 @@ class Mediapipe2dDataPayload:
class MediaPipeSkeletonDetector:
def __init__(
self,
- parameter_model=MediaPipe2DParametersModel(),
+ parameter_model=MediapipeParametersModel(),
):
self._mediapipe_payload_list = []
@@ -89,15 +83,9 @@ class MediaPipeSkeletonDetector:
self._mp_drawing_styles = mp.solutions.drawing_styles
self._mp_holistic = mp.solutions.holistic
- self._body_drawing_spec = self._mp_drawing.DrawingSpec(
- thickness=1, circle_radius=1
- )
- self._hand_drawing_spec = self._mp_drawing.DrawingSpec(
- thickness=1, circle_radius=1
- )
- self._face_drawing_spec = self._mp_drawing.DrawingSpec(
- thickness=1, circle_radius=1
- )
+ self._body_drawing_spec = self._mp_drawing.DrawingSpec(thickness=1, circle_radius=1)
+ self._hand_drawing_spec = self._mp_drawing.DrawingSpec(thickness=1, circle_radius=1)
+ self._face_drawing_spec = self._mp_drawing.DrawingSpec(thickness=1, circle_radius=1)
self._holistic_tracker = self._mp_holistic.Holistic(
model_complexity=parameter_model.model_complexity,
@@ -107,12 +95,8 @@ class MediaPipeSkeletonDetector:
self._mediapipe_tracked_point_names_dict = mediapipe_tracked_point_names_dict
self.body_names_list = self._mediapipe_tracked_point_names_dict["body"]
- self.right_hand_names_list = self._mediapipe_tracked_point_names_dict[
- "right_hand"
- ]
- self.left_hand_names_list = self._mediapipe_tracked_point_names_dict[
- "left_hand"
- ]
+ self.right_hand_names_list = self._mediapipe_tracked_point_names_dict["right_hand"]
+ self.left_hand_names_list = self._mediapipe_tracked_point_names_dict["left_hand"]
self.face_names_list = self._mediapipe_tracked_point_names_dict["face"]
# TODO - build a better iterator and list of `face_marker_names` that will only pull out the face_counters & iris edges (mp.python.solutions.face_mesh_connections.FACEMESH_CONTOURS, FACE_MESH_IRISES)
@@ -120,9 +104,7 @@ class MediaPipeSkeletonDetector:
self.number_of_body_tracked_points = len(self.body_names_list)
self.number_of_right_hand_tracked_points = len(self.right_hand_names_list)
self.number_of_left_hand_tracked_points = len(self.left_hand_names_list)
- self.number_of_face_tracked_points = (
- mp.python.solutions.face_mesh.FACEMESH_NUM_LANDMARKS_WITH_IRISES
- )
+ self.number_of_face_tracked_points = mp.solutions.face_mesh.FACEMESH_NUM_LANDMARKS_WITH_IRISES
self.number_of_tracked_points_total = (
self.number_of_body_tracked_points
@@ -164,116 +146,90 @@ class MediaPipeSkeletonDetector:
)
def process_folder_full_of_videos(
- self,
- path_to_folder_of_videos_to_process: Union[Path, str],
- output_data_folder_path: Union[str, Path],
- save_annotated_videos: bool = True,
- ) -> np.ndarray:
+ self,
+ path_to_folder_of_videos_to_process: Union[Path, str],
+ output_data_folder_path: Union[str, Path],
+ save_annotated_videos: bool = True,
+ kill_event: multiprocessing.Event = None,
+ ) -> Union[np.ndarray, None]:
path_to_folder_of_videos_to_process = Path(path_to_folder_of_videos_to_process)
logger.info(f"processing videos from: {path_to_folder_of_videos_to_process}")
mediapipe2d_single_camera_npy_arrays_list = []
- for video_number, this_synchronized_video_file_path in enumerate(
- path_to_folder_of_videos_to_process.glob("*.mp4")
- ):
- logger.info(
- f"Running `mediapipe` skeleton detection on video: {str(this_synchronized_video_file_path)}"
- )
- this_video_capture_object = cv2.VideoCapture(
- str(this_synchronized_video_file_path)
- )
+ for video_number, synchronized_video_file_path in enumerate(path_to_folder_of_videos_to_process.glob("*.mp4")):
+ logger.info(f"Running `mediapipe` skeleton detection on video: {str(synchronized_video_file_path)}")
+ video_capture_object = cv2.VideoCapture(str(synchronized_video_file_path))
- this_video_width = this_video_capture_object.get(cv2.CAP_PROP_FRAME_WIDTH)
- this_video_height = this_video_capture_object.get(cv2.CAP_PROP_FRAME_HEIGHT)
- this_video_framerate = this_video_capture_object.get(cv2.CAP_PROP_FPS)
+ video_width = video_capture_object.get(cv2.CAP_PROP_FRAME_WIDTH)
+ video_height = video_capture_object.get(cv2.CAP_PROP_FRAME_HEIGHT)
+ video_framerate = video_capture_object.get(cv2.CAP_PROP_FPS)
- this_video_mediapipe_results_list = []
- this_video_annotated_images_list = []
+ video_mediapipe_results_list = []
+ video_annotated_images_list = []
- success, image = this_video_capture_object.read()
+ success, image = video_capture_object.read()
- number_of_frames = int(
- this_video_capture_object.get(cv2.CAP_PROP_FRAME_COUNT)
- )
+ number_of_frames = int(video_capture_object.get(cv2.CAP_PROP_FRAME_COUNT))
for frame_number in tqdm(
range(number_of_frames),
- desc=f"mediapiping video: {this_synchronized_video_file_path.name}",
+ desc=f"mediapiping video: {synchronized_video_file_path.name}",
total=number_of_frames,
colour="magenta",
unit="frames",
dynamic_ncols=True,
):
+ if kill_event is not None and kill_event.is_set():
+ logger.info("kill event received, exiting mediapipe process")
+ return
+
if not success or image is None:
- logger.error(
- f"Failed to load an image from: {str(this_synchronized_video_file_path)}"
- )
+ logger.error(f"Failed to load an image from: {str(synchronized_video_file_path)}")
raise Exception
- mediapipe2d_data_payload = self.detect_skeleton_in_image(
- raw_image=image
- )
- this_video_mediapipe_results_list.append(
- mediapipe2d_data_payload.mediapipe_results
- )
- annotated_image = self._annotate_image(
- image, mediapipe2d_data_payload.mediapipe_results
- )
- this_video_annotated_images_list.append(annotated_image)
+ mediapipe2d_data_payload = self.detect_skeleton_in_image(raw_image=image)
+ video_mediapipe_results_list.append(mediapipe2d_data_payload.mediapipe_results)
+ annotated_image = self._annotate_image(image, mediapipe2d_data_payload.mediapipe_results)
+ video_annotated_images_list.append(annotated_image)
- success, image = this_video_capture_object.read()
+ success, image = video_capture_object.read()
if save_annotated_videos:
- annotated_video_path = (
- path_to_folder_of_videos_to_process.parent / "annotated_videos"
- )
+ annotated_video_path = path_to_folder_of_videos_to_process.parent / ANNOTATED_VIDEOS_FOLDER_NAME
annotated_video_path.mkdir(exist_ok=True, parents=True)
- annotated_video_name = (
- this_synchronized_video_file_path.stem + "_mediapipe.mp4"
- )
+ annotated_video_name = synchronized_video_file_path.stem + "_mediapipe.mp4"
annotated_video_save_path = annotated_video_path / annotated_video_name
video_recorder = VideoRecorder()
- logger.info(
- f"Saving mediapipe annotated video to : {annotated_video_save_path}"
- )
+ logger.info(f"Saving mediapipe annotated video to : {annotated_video_save_path}")
video_recorder.save_image_list_to_disk(
- image_list=this_video_annotated_images_list,
+ image_list=video_annotated_images_list,
path_to_save_video_file=annotated_video_save_path,
- frames_per_second=this_video_framerate,
+ frames_per_second=video_framerate,
)
- this_camera_mediapipe_2d_single_camera_npy_arrays = (
- self._list_of_mediapipe_results_to_npy_arrays(
- this_video_mediapipe_results_list,
- image_width=this_video_width,
- image_height=this_video_height,
- )
+ camera_mediapipe_2d_single_camera_npy_arrays = self._list_of_mediapipe_results_to_npy_arrays(
+ video_mediapipe_results_list,
+ image_width=video_width,
+ image_height=video_height,
)
- mediapipe2d_single_camera_npy_arrays_list.append(
- this_camera_mediapipe_2d_single_camera_npy_arrays
- )
+ mediapipe2d_single_camera_npy_arrays_list.append(camera_mediapipe_2d_single_camera_npy_arrays)
all_cameras_data2d_list = [
- m2d.all_data2d_nFrames_nTrackedPts_XY
- for m2d in mediapipe2d_single_camera_npy_arrays_list
+ m2d.all_data2d_nFrames_nTrackedPts_XY for m2d in mediapipe2d_single_camera_npy_arrays_list
]
number_of_cameras = len(all_cameras_data2d_list)
number_of_frames = all_cameras_data2d_list[0].shape[0]
number_of_tracked_points = all_cameras_data2d_list[0].shape[1]
- number_of_spatial_dimensions = all_cameras_data2d_list[0].shape[
- 2
- ] # XY, 2d data
+ number_of_spatial_dimensions = all_cameras_data2d_list[0].shape[2] # XY, 2d data
if not number_of_spatial_dimensions == 2:
- logger.error(
- f"this should be 2D data (XY pixel coordinates), but we founds {number_of_spatial_dimensions}"
- )
+ logger.error(f"this should be 2D data (XY pixel coordinates), but we founds {number_of_spatial_dimensions}")
raise Exception
data2d_numCams_numFrames_numTrackedPts_XY = np.empty(
@@ -285,10 +241,8 @@ class MediaPipeSkeletonDetector:
)
)
- for this_cam_num in range(number_of_cameras):
- data2d_numCams_numFrames_numTrackedPts_XY[
- this_cam_num, :, :, :
- ] = all_cameras_data2d_list[this_cam_num]
+ for cam_num in range(number_of_cameras):
+ data2d_numCams_numFrames_numTrackedPts_XY[cam_num, :, :, :] = all_cameras_data2d_list[cam_num]
mediapipe_data_2d_npy_path = self._save_mediapipe2d_data_to_npy(
data2d_numCams_numFrames_numTrackedPts_XY=data2d_numCams_numFrames_numTrackedPts_XY,
@@ -301,14 +255,10 @@ class MediaPipeSkeletonDetector:
data2d_numCams_numFrames_numTrackedPts_XY: np.ndarray,
output_data_folder_path: Union[str, Path],
):
- mediapipe_2dData_save_path = (
- Path(output_data_folder_path) / MEDIAPIPE_2D_NPY_FILE_NAME
- )
+ mediapipe_2dData_save_path = Path(output_data_folder_path) / MEDIAPIPE_2D_NPY_FILE_NAME
mediapipe_2dData_save_path.parent.mkdir(exist_ok=True, parents=True)
logger.info(f"saving: {mediapipe_2dData_save_path}")
- np.save(
- str(mediapipe_2dData_save_path), data2d_numCams_numFrames_numTrackedPts_XY
- )
+ np.save(str(mediapipe_2dData_save_path), data2d_numCams_numFrames_numTrackedPts_XY)
return mediapipe_2dData_save_path
@@ -357,10 +307,6 @@ class MediaPipeSkeletonDetector:
image_height: Union[int, float],
) -> Mediapipe2dNumpyArrays:
- # apparently `mediapipe_results.pose_landmarks.landmark` returns something iterable Β―\_(ツ)_/Β―
- mediapipe_pose_landmark_iterator = mp.python.solutions.pose.PoseLandmark
- mediapipe_hand_landmark_iterator = mp.python.solutions.hands.HandLandmark
-
number_of_frames = len(mediapipe_results_list)
number_of_spatial_dimensions = 2 # this will be 2d XY pixel data
@@ -376,9 +322,7 @@ class MediaPipeSkeletonDetector:
body2d_frameNumber_trackedPointNumber_confidence = np.zeros(
(number_of_frames, self.number_of_body_tracked_points)
)
- body2d_frameNumber_trackedPointNumber_confidence[
- :
- ] = np.nan # only body markers get a 'confidence' value
+ body2d_frameNumber_trackedPointNumber_confidence[:] = np.nan # only body markers get a 'confidence' value
rightHand2d_frameNumber_trackedPointNumber_XY = np.zeros(
(
@@ -407,122 +351,74 @@ class MediaPipeSkeletonDetector:
)
face2d_frameNumber_trackedPointNumber_XY[:] = np.nan
- all_body_tracked_points_visible_on_this_frame_bool_list = []
- all_right_hand_points_visible_on_this_frame_bool_list = []
- all_left_hand_points_visible_on_this_frame_bool_list = []
- all_face_points_visible_on_this_frame_bool_list = []
- all_tracked_points_visible_on_this_frame_list = []
+ all_body_tracked_points_visible_on_frame_bool_list = []
+ all_right_hand_points_visible_on_frame_bool_list = []
+ all_left_hand_points_visible_on_frame_bool_list = []
+ all_face_points_visible_on_frame_bool_list = []
+ all_tracked_points_visible_on_frame_list = []
- for this_frame_number, this_frame_results in enumerate(mediapipe_results_list):
+ for frame_number, frame_results in enumerate(mediapipe_results_list):
# get the Body data (aka 'pose')
- if this_frame_results.pose_landmarks is not None:
-
- for this_landmark_number, this_landmark_data in enumerate(
- this_frame_results.pose_landmarks.landmark
- ):
- body2d_frameNumber_trackedPointNumber_XY[
- this_frame_number, this_landmark_number, 0
- ] = (this_landmark_data.x * image_width)
- body2d_frameNumber_trackedPointNumber_XY[
- this_frame_number, this_landmark_number, 1
- ] = (this_landmark_data.y * image_height)
+ if frame_results.pose_landmarks is not None:
+
+ for landmark_number, landmark_data in enumerate(frame_results.pose_landmarks.landmark):
+ body2d_frameNumber_trackedPointNumber_XY[frame_number, landmark_number, 0] = (
+ landmark_data.x * image_width
+ )
+ body2d_frameNumber_trackedPointNumber_XY[frame_number, landmark_number, 1] = (
+ landmark_data.y * image_height
+ )
body2d_frameNumber_trackedPointNumber_confidence[
- this_frame_number, this_landmark_number
- ] = (
- this_landmark_data.visibility
- ) # mediapipe calls their 'confidence' score 'visibility'
+ frame_number, landmark_number
+ ] = landmark_data.visibility # mediapipe calls their 'confidence' score 'visibility'
# get Right Hand data
- if this_frame_results.right_hand_landmarks is not None:
- for this_landmark_number, this_landmark_data in enumerate(
- this_frame_results.right_hand_landmarks.landmark
- ):
- rightHand2d_frameNumber_trackedPointNumber_XY[
- this_frame_number, this_landmark_number, 0
- ] = (this_landmark_data.x * image_width)
- rightHand2d_frameNumber_trackedPointNumber_XY[
- this_frame_number, this_landmark_number, 1
- ] = (this_landmark_data.y * image_height)
+ if frame_results.right_hand_landmarks is not None:
+ for landmark_number, landmark_data in enumerate(frame_results.right_hand_landmarks.landmark):
+ rightHand2d_frameNumber_trackedPointNumber_XY[frame_number, landmark_number, 0] = (
+ landmark_data.x * image_width
+ )
+ rightHand2d_frameNumber_trackedPointNumber_XY[frame_number, landmark_number, 1] = (
+ landmark_data.y * image_height
+ )
# get Left Hand data
- if this_frame_results.left_hand_landmarks is not None:
- for this_landmark_number, this_landmark_data in enumerate(
- this_frame_results.left_hand_landmarks.landmark
- ):
- leftHand2d_frameNumber_trackedPointNumber_XY[
- this_frame_number, this_landmark_number, 0
- ] = (this_landmark_data.x * image_width)
- leftHand2d_frameNumber_trackedPointNumber_XY[
- this_frame_number, this_landmark_number, 1
- ] = (this_landmark_data.y * image_height)
+ if frame_results.left_hand_landmarks is not None:
+ for landmark_number, landmark_data in enumerate(frame_results.left_hand_landmarks.landmark):
+ leftHand2d_frameNumber_trackedPointNumber_XY[frame_number, landmark_number, 0] = (
+ landmark_data.x * image_width
+ )
+ leftHand2d_frameNumber_trackedPointNumber_XY[frame_number, landmark_number, 1] = (
+ landmark_data.y * image_height
+ )
# get Face data
- if this_frame_results.face_landmarks is not None:
- for this_landmark_number, this_landmark_data in enumerate(
- this_frame_results.face_landmarks.landmark
- ):
- face2d_frameNumber_trackedPointNumber_XY[
- this_frame_number, this_landmark_number, 0
- ] = (this_landmark_data.x * image_width)
- face2d_frameNumber_trackedPointNumber_XY[
- this_frame_number, this_landmark_number, 1
- ] = (this_landmark_data.y * image_height)
+ if frame_results.face_landmarks is not None:
+ for landmark_number, landmark_data in enumerate(frame_results.face_landmarks.landmark):
+ face2d_frameNumber_trackedPointNumber_XY[frame_number, landmark_number, 0] = (
+ landmark_data.x * image_width
+ )
+ face2d_frameNumber_trackedPointNumber_XY[frame_number, landmark_number, 1] = (
+ landmark_data.y * image_height
+ )
# check if all tracked points are visible on this frame
- all_body_visible = all(
- sum(
- np.isnan(
- body2d_frameNumber_trackedPointNumber_XY[
- this_frame_number, :, :
- ]
- )
- )
- == 0
- )
- all_body_tracked_points_visible_on_this_frame_bool_list.append(
- all_body_visible
- )
+ all_body_visible = all(sum(np.isnan(body2d_frameNumber_trackedPointNumber_XY[frame_number, :, :])) == 0)
+ all_body_tracked_points_visible_on_frame_bool_list.append(all_body_visible)
all_right_hand_visible = all(
- sum(
- np.isnan(
- rightHand2d_frameNumber_trackedPointNumber_XY[
- this_frame_number, :, :
- ]
- )
- )
- == 0
- )
- all_right_hand_points_visible_on_this_frame_bool_list.append(
- all_right_hand_visible
+ sum(np.isnan(rightHand2d_frameNumber_trackedPointNumber_XY[frame_number, :, :])) == 0
)
+ all_right_hand_points_visible_on_frame_bool_list.append(all_right_hand_visible)
all_left_hand_visible = all(
- sum(
- np.isnan(
- leftHand2d_frameNumber_trackedPointNumber_XY[
- this_frame_number, :, :
- ]
- )
- )
- == 0
- )
- all_left_hand_points_visible_on_this_frame_bool_list.append(
- all_left_hand_visible
+ sum(np.isnan(leftHand2d_frameNumber_trackedPointNumber_XY[frame_number, :, :])) == 0
)
+ all_left_hand_points_visible_on_frame_bool_list.append(all_left_hand_visible)
- all_face_visible = all(
- sum(
- np.isnan(
- face2d_frameNumber_trackedPointNumber_XY[
- this_frame_number, :, :
- ]
- )
- )
- == 0
- )
- all_face_points_visible_on_this_frame_bool_list.append(all_face_visible)
+ all_face_visible = all(sum(np.isnan(face2d_frameNumber_trackedPointNumber_XY[frame_number, :, :])) == 0)
+ all_face_points_visible_on_frame_bool_list.append(all_face_visible)
all_points_visible = all(
[
@@ -533,21 +429,13 @@ class MediaPipeSkeletonDetector:
],
)
- all_tracked_points_visible_on_this_frame_list.append(all_points_visible)
+ all_tracked_points_visible_on_frame_list.append(all_points_visible)
return Mediapipe2dNumpyArrays(
- body2d_frameNumber_trackedPointNumber_XY=np.squeeze(
- body2d_frameNumber_trackedPointNumber_XY
- ),
- rightHand2d_frameNumber_trackedPointNumber_XY=np.squeeze(
- rightHand2d_frameNumber_trackedPointNumber_XY
- ),
- leftHand2d_frameNumber_trackedPointNumber_XY=np.squeeze(
- leftHand2d_frameNumber_trackedPointNumber_XY
- ),
- face2d_frameNumber_trackedPointNumber_XY=np.squeeze(
- face2d_frameNumber_trackedPointNumber_XY
- ),
+ body2d_frameNumber_trackedPointNumber_XY=np.squeeze(body2d_frameNumber_trackedPointNumber_XY),
+ rightHand2d_frameNumber_trackedPointNumber_XY=np.squeeze(rightHand2d_frameNumber_trackedPointNumber_XY),
+ leftHand2d_frameNumber_trackedPointNumber_XY=np.squeeze(leftHand2d_frameNumber_trackedPointNumber_XY),
+ face2d_frameNumber_trackedPointNumber_XY=np.squeeze(face2d_frameNumber_trackedPointNumber_XY),
body2d_frameNumber_trackedPointNumber_confidence=np.squeeze(
body2d_frameNumber_trackedPointNumber_confidence
),
diff --git a/freemocap/core_processes/detecting_things_in_2d_images/mediapipe_stuff/mediapipe_skeleton_names_and_connections.py b/freemocap/core_processes/detecting_things_in_2d_images/mediapipe_stuff/mediapipe_skeleton_names_and_connections.py
new file mode 100644
index 00000000..47b89f4d
--- /dev/null
+++ b/freemocap/core_processes/detecting_things_in_2d_images/mediapipe_stuff/mediapipe_skeleton_names_and_connections.py
@@ -0,0 +1,54 @@
+from mediapipe.python.solutions import holistic as mp_holistic
+
+mediapipe_body_connections = [connection for connection in mp_holistic.POSE_CONNECTIONS]
+
+mediapipe_hand_connections = [connection for connection in mp_holistic.HAND_CONNECTIONS]
+
+mediapipe_face_connections = [connection for connection in mp_holistic.FACEMESH_CONTOURS]
+
+mediapipe_body_landmark_names = [landmark.name.lower() for landmark in mp_holistic.PoseLandmark]
+NUMBER_OF_MEDIAPIPE_BODY_MARKERS = len(mediapipe_body_landmark_names)
+
+mediapipe_hand_landmark_names = [landmark.name.lower() for landmark in mp_holistic.HandLandmark]
+
+
+mediapipe_face_landmark_names = [
+ "right_eye",
+ "left_eye",
+ "nose_tip",
+ "mouth_center",
+ "right_ear_tragion",
+ "left_ear_tragion",
+]
+
+mediapipe_tracked_point_names_dict = {
+ "body": mediapipe_body_landmark_names,
+ "right_hand": [f"right_hand_{name}" for name in mediapipe_hand_landmark_names],
+ "left_hand": [f"left_hand_{name}" for name in mediapipe_hand_landmark_names],
+ "face": mediapipe_face_landmark_names,
+}
+
+mediapipe_names_and_connections_dict = {
+ "body": {
+ "names": mediapipe_body_landmark_names,
+ "connections": mediapipe_body_connections,
+ },
+ "right_hand": {
+ "names": [f"right_hand_{name}" for name in mediapipe_hand_landmark_names],
+ "connections": mediapipe_hand_connections,
+ },
+ "left_hand": {
+ "names": [f"left_hand_{name}" for name in mediapipe_hand_landmark_names],
+ "connections": mediapipe_hand_connections,
+ },
+ "face": {
+ "names": mediapipe_face_landmark_names,
+ "connections": mediapipe_face_connections,
+ },
+}
+
+
+if __name__ == "__main__":
+ import pprint
+
+ pprint.pp(mediapipe_tracked_point_names_dict)
diff --git a/src/cameras/__init__.py b/freemocap/core_processes/export_data/__init__.py
similarity index 100%
rename from src/cameras/__init__.py
rename to freemocap/core_processes/export_data/__init__.py
diff --git a/src/cameras/capture/__init__.py b/freemocap/core_processes/export_data/blender_stuff/__init__.py
similarity index 100%
rename from src/cameras/capture/__init__.py
rename to freemocap/core_processes/export_data/blender_stuff/__init__.py
diff --git a/src/cameras/capture/dataclasses/__init__.py b/freemocap/core_processes/export_data/blender_stuff/blender_bpy_export_scripts/__init__.py
similarity index 100%
rename from src/cameras/capture/dataclasses/__init__.py
rename to freemocap/core_processes/export_data/blender_stuff/blender_bpy_export_scripts/__init__.py
diff --git a/src/blender_stuff/alpha_freemocap_blender_megascript.py b/freemocap/core_processes/export_data/blender_stuff/blender_bpy_export_scripts/alpha_freemocap_blender_megascript.py
similarity index 94%
rename from src/blender_stuff/alpha_freemocap_blender_megascript.py
rename to freemocap/core_processes/export_data/blender_stuff/blender_bpy_export_scripts/alpha_freemocap_blender_megascript.py
index 699e42ef..4bd74299 100644
--- a/src/blender_stuff/alpha_freemocap_blender_megascript.py
+++ b/freemocap/core_processes/export_data/blender_stuff/blender_bpy_export_scripts/alpha_freemocap_blender_megascript.py
@@ -1,15 +1,15 @@
+import sys
+from pathlib import Path
+
import bpy
-import addon_utils
import numpy as np
-from pathlib import Path
-import sys
print(" - Starting (alpha) blender megascript - ")
#######################################################################
##% Activate necessary addons
-addon_utils.enable("io_import_images_as_planes")
-addon_utils.enable("rigify")
+bpy.ops.preferences.addon_enable(module="io_import_images_as_planes")
+bpy.ops.preferences.addon_enable(module="rigify")
#######################################################################
@@ -20,50 +20,29 @@ try:
argv = argv[argv.index("--") + 1 :]
session_path = argv[0]
- if len(argv) > 1:
- good_clean_frame_number = int(argv[1])
+ blend_file_save_path = argv[1]
+ if len(argv) > 2:
+ good_clean_frame_number = int(argv[2])
else:
good_clean_frame_number = 0
except:
- print(
- "we appear to be running from the Blender Scripting tab! Manually enter your `session_path` at line 23"
- )
+ print("we appear to be running from the Blender Scripting tab! Manually enter your `session_path` at line 23")
session_path = Path(
r"C:\Users\jonma\Dropbox\FreeMoCapProject\FreeMocap_Data\sesh_2022-05-07_17_15_05_pupil_wobble_juggle_0"
)
good_clean_frame_number = 3341
-print(str(session_path))
+print(f"Using session path - {str(session_path)}")
session_path = Path(session_path)
-if Path(
- session_path / "output_data" / "partially_processed_data"
-).exists(): # freemocap version > v0.0.54
- path_to_data_arrays_folder = session_path / "output_data"
-
- path_to_mediapipe_npy = (
- path_to_data_arrays_folder
- / "partially_processed_data"
- / "mediaPipeSkel_3d_origin_aligned.npy"
- )
-
- path_to_mediapipe_3d_reproj = (
- path_to_data_arrays_folder
- / "raw_data"
- / "mediapipe_3dData_numFrames_numTrackedPoints_reprojectionError.npy"
- )
-
-else:
- path_to_data_arrays_folder = (
- session_path / "DataArrays"
- ) # freemocap version <= v0.0.54
- path_to_mediapipe_npy = path_to_data_arrays_folder / "mediaPipeSkel_3d_smoothed.npy"
-
- path_to_mediapipe_3d_reproj = (
- path_to_data_arrays_folder / "mediaPipeSkel_reprojErr.npy"
- )
+path_to_mediapipe_npy = (
+ session_path / "output_data" / "raw_data" / "mediapipe3dData_numFrames_numTrackedPoints_spatialXYZ.npy"
+)
+path_to_mediapipe_3d_reproj = (
+ session_path / "output_data" / "raw_data" / "mediapipe3dData_numFrames_numTrackedPoints_reprojectionError.npy"
+)
- print(f"Loading mediapipe data from {path_to_mediapipe_npy}")
+print(f"Loading mediapipe data from {path_to_mediapipe_npy}")
#######################################################################
# %% load mediapipe data
# %%
@@ -76,17 +55,12 @@ mediapipe_skel_fr_mar_dim = mediapipe_skel_fr_mar_dim / 1000 # convert to meter
print(f"Loading mediapipe reprojection error data from {path_to_mediapipe_3d_reproj}")
mediapipe_reprojection_error_fr_mar = np.load(str(path_to_mediapipe_3d_reproj))
-print(
- f"mediapipe_reprojection_error_fr_mar.shape = {mediapipe_reprojection_error_fr_mar.shape}"
-)
-
+print(f"mediapipe_reprojection_error_fr_mar.shape = {mediapipe_reprojection_error_fr_mar.shape}")
body_marker_range = np.arange(0, 33)
right_hand_marker_range = np.arange(33, 33 + 21)
left_hand_marker_range = np.arange(33 + 21, 33 + 21 + 21)
-face_marker_range = np.arange(
- left_hand_marker_range[-1], mediapipe_skel_fr_mar_dim.shape[1]
-)
+face_marker_range = np.arange(left_hand_marker_range[-1], mediapipe_skel_fr_mar_dim.shape[1])
body_skel_fr_mar_dim = mediapipe_skel_fr_mar_dim[
:,
@@ -124,12 +98,8 @@ if good_clean_frame_number == 0:
frame_mean_reproj_error = []
for this_frame in range(mediapipe_skel_fr_mar_dim.shape[0]):
- frame_nan_counts.append(
- np.sum(np.isnan(mediapipe_skel_fr_mar_dim[this_frame, :, 0]))
- )
- frame_mean_reproj_error.append(
- np.nanmean(mediapipe_reprojection_error_fr_mar[this_frame, :])
- )
+ frame_nan_counts.append(np.sum(np.isnan(mediapipe_skel_fr_mar_dim[this_frame, :, 0])))
+ frame_mean_reproj_error.append(np.nanmean(mediapipe_reprojection_error_fr_mar[this_frame, :]))
nan_times_vis = np.array(frame_nan_counts) * np.array(frame_mean_reproj_error)
num_frames = len(frame_nan_counts)
@@ -251,15 +221,13 @@ try:
bpy.ops.object.empty_add(type="ARROWS")
freemocap_origin_axes = bpy.context.active_object
- freemocap_origin_axes.name = "freemocap_origin_axes" # will translate to put skelly on ground symmetric-ish about origin
+ freemocap_origin_axes.name = (
+ "freemocap_origin_axes" # will translate to put skelly on ground symmetric-ish about origin
+ )
#######################################################################
# %% load empties
- print(
- "loading {} empties on {} frames".format(
- len(mediapipe_tracked_point_names), number_of_frames
- )
- )
+ print("loading {} empties on {} frames".format(len(mediapipe_tracked_point_names), number_of_frames))
empty_size = 0.01
@@ -297,10 +265,7 @@ try:
#######################################################################
print("creating virtual markers")
print("head_center - midway between left and right ears")
- hips_xyz = (
- mediapipe_skel_fr_mar_dim[:, left_ear_index, :]
- + mediapipe_skel_fr_mar_dim[:, right_ear_index, :]
- ) / 2
+ hips_xyz = (mediapipe_skel_fr_mar_dim[:, left_ear_index, :] + mediapipe_skel_fr_mar_dim[:, right_ear_index, :]) / 2
bpy.ops.object.empty_add(type="SPHERE")
this_empty = bpy.context.active_object
this_empty.name = "head_center"
@@ -320,8 +285,7 @@ try:
left_shoulder_index = 11
right_shoulder_index = 12
neck_xyz = (
- mediapipe_skel_fr_mar_dim[:, left_shoulder_index, :]
- + mediapipe_skel_fr_mar_dim[:, right_shoulder_index, :]
+ mediapipe_skel_fr_mar_dim[:, left_shoulder_index, :] + mediapipe_skel_fr_mar_dim[:, right_shoulder_index, :]
) / 2
bpy.ops.object.empty_add(type="PLAIN_AXES")
this_empty = bpy.context.active_object
@@ -341,10 +305,7 @@ try:
print("hip_center - midway between left and right hips")
left_hip_index = 23
right_hip_index = 24
- hips_xyz = (
- mediapipe_skel_fr_mar_dim[:, left_hip_index, :]
- + mediapipe_skel_fr_mar_dim[:, right_hip_index, :]
- ) / 2
+ hips_xyz = (mediapipe_skel_fr_mar_dim[:, left_hip_index, :] + mediapipe_skel_fr_mar_dim[:, right_hip_index, :]) / 2
bpy.ops.object.empty_add(type="PLAIN_AXES")
this_empty = bpy.context.active_object
this_empty.name = "hip_center"
@@ -921,12 +882,8 @@ try:
print(
f"setting bone: {this_bone_name}: head: {bpy.data.objects[this_head_empty_name].location}, tail: {bpy.data.objects[this_tail_empty_name].location}"
)
- this_edit_bone.head = bpy.data.objects[
- this_head_empty_name
- ].location
- this_edit_bone.tail = bpy.data.objects[
- this_tail_empty_name
- ].location
+ this_edit_bone.head = bpy.data.objects[this_head_empty_name].location
+ this_edit_bone.tail = bpy.data.objects[this_tail_empty_name].location
else: # remove bones with no tail (and/or head) until we figure out a better plan
print(f"removing bone: {this_bone_name}")
this_metarig.data.edit_bones.remove(this_edit_bone)
@@ -1193,9 +1150,7 @@ try:
this_constraint_name,
this_constraint_target_empty_name,
) in this_bone_dict.items():
- print(
- f"constraint: {this_constraint_name} with target:{this_constraint_target_empty_name}"
- )
+ print(f"constraint: {this_constraint_name} with target:{this_constraint_target_empty_name}")
print("grab bone")
this_bone = this_armature.pose.bones[this_bone_name]
print("apply bone")
@@ -1548,21 +1503,12 @@ try:
this_weight = this_weighted_point_dict[1]
these_weighted_points.append(
- mediapipe_skel_fr_mar_dim[
- :, mediapipe_tracked_point_names.index(this_point_name), :
- ]
- * this_weight
+ mediapipe_skel_fr_mar_dim[:, mediapipe_tracked_point_names.index(this_point_name), :] * this_weight
)
this_virtual_point_fr_xyz = np.sum(these_weighted_points, axis=0)
- this_virtual_point_fr_mar_xyz = np.expand_dims(
- this_virtual_point_fr_xyz, axis=1
- )
- mediapipe_skel_fr_mar_dim = np.append(
- mediapipe_skel_fr_mar_dim, this_virtual_point_fr_mar_xyz, axis=1
- )
- virtual_point_index_dict[this_virtual_marker_name] = (
- mediapipe_skel_fr_mar_dim.shape[1] - 1
- )
+ this_virtual_point_fr_mar_xyz = np.expand_dims(this_virtual_point_fr_xyz, axis=1)
+ mediapipe_skel_fr_mar_dim = np.append(mediapipe_skel_fr_mar_dim, this_virtual_point_fr_mar_xyz, axis=1)
+ virtual_point_index_dict[this_virtual_marker_name] = mediapipe_skel_fr_mar_dim.shape[1] - 1
print(
f"Virtual marker: {this_virtual_marker_name} created at marker index {mediapipe_skel_fr_mar_dim.shape[1] - 1}"
)
@@ -1595,9 +1541,7 @@ try:
f"edge created for bone: ({this_bone_dict[0]} : {head_name}-{tail_name}), indicies({this_edge[0]},{this_edge[1]})"
)
except:
- print(
- f"edge FAILED for for bone:{this_bone_dict[0]} : {head_name}-{tail_name}"
- )
+ print(f"edge FAILED for for bone:{this_bone_dict[0]} : {head_name}-{tail_name}")
pass
print("edges created!")
@@ -1718,6 +1662,6 @@ except Exception as e:
# save .blend file
sessionID = session_path.stem
-blend_file_save_path = session_path / (sessionID + ".blend")
+
print(f"Saving Blender output file to: {str(blend_file_save_path)}")
bpy.ops.wm.save_as_mainfile(filepath=str(blend_file_save_path))
diff --git a/freemocap/core_processes/export_data/blender_stuff/blender_bpy_export_scripts/cgtinker_blendarmocap_load.py b/freemocap/core_processes/export_data/blender_stuff/blender_bpy_export_scripts/cgtinker_blendarmocap_load.py
new file mode 100644
index 00000000..d2a2be12
--- /dev/null
+++ b/freemocap/core_processes/export_data/blender_stuff/blender_bpy_export_scripts/cgtinker_blendarmocap_load.py
@@ -0,0 +1,36 @@
+import logging
+import sys
+
+from BlendArMocap.src.cgt_freemocap.fm_subprocess_cmd_receiver import import_freemocap_session
+
+logger = logging.getLogger(__name__)
+
+argv = sys.argv
+argv = argv[argv.index("--") + 1 :]
+recording_path = argv[0]
+blender_save_path = argv[1]
+bind_to_rig_bool = bool(argv[2])
+load_synchronized_videos_bool = bool(argv[3])
+timeout = bool(argv[4])
+load_raw_bool = bool(argv[5])
+load_quick_bool = bool(argv[6])
+
+logger.info(
+ f"Invoking CGTinker's BlendArMocap based export method with arguments -"
+ f"\nrecording_path: {recording_path}, "
+ f"\nblender_save_path: {blender_save_path}, "
+ f"\nbind_to_rig_bool: {bind_to_rig_bool}, "
+ f"\nload_synchronized_videos_bool: {load_synchronized_videos_bool}, "
+ f"\ntimeout: {timeout}, "
+ f"\nload_raw_bool: {load_raw_bool}, "
+ f"\nload_quick_bool: {load_quick_bool}"
+)
+
+import_freemocap_session(
+ session_directory=recording_path,
+ bind_to_rig=bind_to_rig_bool,
+ load_synch_videos=load_synchronized_videos_bool,
+ timeout=timeout,
+ load_raw=load_raw_bool,
+ load_quick=load_quick_bool,
+)
diff --git a/freemocap/core_processes/export_data/blender_stuff/blender_bpy_export_scripts/freemocap_blender_megascript_take2.py b/freemocap/core_processes/export_data/blender_stuff/blender_bpy_export_scripts/freemocap_blender_megascript_take2.py
new file mode 100644
index 00000000..df36d539
--- /dev/null
+++ b/freemocap/core_processes/export_data/blender_stuff/blender_bpy_export_scripts/freemocap_blender_megascript_take2.py
@@ -0,0 +1,924 @@
+import json
+import logging
+import pprint
+import sys
+from copy import copy
+from pathlib import Path
+from typing import List, Union, Dict
+
+
+
+import addon_utils
+import bpy
+import numpy as np
+
+print("Running script to create Blender file from freemocap session data: " + __file__)
+
+logger = logging.getLogger(__name__)
+
+
+###############################################################
+### IF YOU ARE RUNNING THIS SCRIPT FROM WITHIN BLENDER -
+### CHANGE THE PATH TO THE SESSION FOLDER IN THE `if __name__ == "__main__":` BLOCK AT THE **BOTTOM** OF THIS FILE
+### the variable is named `recording_path_input`
+###############################################################
+
+
+def main(recording_path: Union[str, Path],
+ blender_file_save_path: Union[str, Path],
+ mediapipe_empty_names: Dict[str, List[str]],
+ create_rig: bool = True,
+ ):
+ ###%% clear the scene - Scorch the earth \o/
+ print("Clearing scene...")
+ try:
+ bpy.ops.object.mode_set(mode="OBJECT")
+ except:
+ pass
+ try:
+ bpy.ops.object.select_all(action="SELECT") # select all objects
+ bpy.ops.object.delete(use_global=True) # delete all objects from all scenes
+ except:
+ pass
+
+ print("Loading data....")
+
+ # paths and whatnot
+ try:
+ # load mediapipe skeleton data
+ path_to_data_arrays_folder = recording_path / "output_data"
+ path_to_body_npy = path_to_data_arrays_folder / "mediapipe_body_3d_xyz.npy"
+ path_to_right_hand_npy = path_to_data_arrays_folder / "mediapipe_right_hand_3d_xyz.npy"
+ path_to_left_hand_npy = path_to_data_arrays_folder / "mediapipe_left_hand_3d_xyz.npy"
+ path_to_face_npy = path_to_data_arrays_folder / "mediapipe_face_3d_xyz.npy"
+
+ mediapipe_body_fr_mar_xyz = np.load(str(path_to_body_npy)) / 1000 # load and convert to meters
+ mediapipe_right_hand_fr_mar_xyz = np.load(str(path_to_right_hand_npy)) / 1000
+ mediapipe_left_hand_fr_mar_xyz = np.load(str(path_to_left_hand_npy)) / 1000
+ mediapipe_face_fr_mar_xyz = np.load(str(path_to_face_npy)) / 1000
+
+ # load reprojection error
+ path_to_reprojection_error_npy = (
+ path_to_data_arrays_folder / "raw_data" / "mediapipe3dData_numFrames_numTrackedPoints_reprojectionError.npy"
+ )
+ mediapipe_reprojection_error_fr_mar = np.load(str(path_to_reprojection_error_npy))
+
+ # load skeleton segment lengths
+ path_to_segment_length_json = path_to_data_arrays_folder / "mediapipe_skeleton_segment_lengths.json"
+ print(f"loading skeleton segment lengths from `json` at - {str(path_to_segment_length_json)}")
+ f = open(path_to_segment_length_json)
+ skeleton_segment_lengths_dict = json.load(f)
+
+ except Exception as e:
+ print("Failed to load freemocap data")
+ raise e
+
+ number_of_frames = mediapipe_body_fr_mar_xyz.shape[0]
+ print(f"mediapipe_body_fr_mar_dim.shape: {mediapipe_body_fr_mar_xyz.shape}")
+ print(f"mediapipe_reprojection_error_fr_mar.shape: {mediapipe_reprojection_error_fr_mar.shape}")
+
+ #########################
+ ### Create Origin Axes
+
+ bpy.ops.object.empty_add(type="SPHERE", scale=(3.0, 3.0, 3.0))
+ world_origin_axes = bpy.context.editable_objects[-1]
+ world_origin_axes.name = "world_origin" # will stay at origin
+
+ bpy.ops.object.empty_add(type="ARROWS")
+ freemocap_origin_axes = bpy.context.editable_objects[-1]
+ freemocap_origin_axes.name = (
+ "freemocap_origin_axes" # will translate to put skelly on ground symmetric-ish about origin
+ )
+
+ ##############################
+ # %% Set start and end frames
+
+ start_frame = 1
+ end_frame = number_of_frames
+
+ bpy.context.scene.frame_start = start_frame
+ bpy.context.scene.frame_end = end_frame
+
+ ############################
+ ### Load mocap data as empty markers
+
+ print("_________________________\n"
+ "__________________________\n"
+ "Loading freemocap trajectory data as empty markers..."
+ "_________________________\n")
+
+ mediapipe_body_trajectory_names = [empty_name for empty_name in mediapipe_empty_names["body"]]
+
+ mediapipe_right_hand_trajectory_names = [f"right_hand_{empty_name}" for empty_name in mediapipe_empty_names["hand"]]
+ mediapipe_left_hand_trajectory_names = [f"left_hand_{empty_name}" for empty_name in mediapipe_empty_names["hand"]]
+ # mediapipe_face_trajectory_names = [f"face_{number}:{empty_name}" for number, empty_name in
+ # face_contour_marker_indices]
+
+ # create empty markers for body
+ body_empty_scale = 0.02
+ for marker_number in range(mediapipe_body_fr_mar_xyz.shape[1]):
+ trajectory_name = mediapipe_body_trajectory_names[marker_number]
+ trajectory_fr_xyz = mediapipe_body_fr_mar_xyz[:, marker_number, :]
+ create_keyframed_empty_from_3d_trajectory_data(
+ trajectory_fr_xyz=trajectory_fr_xyz,
+ trajectory_name=trajectory_name,
+ parent_origin=freemocap_origin_axes,
+ empty_scale=0.01,
+ empty_type="SPHERE",
+ )
+
+ # create empty markers for right hand
+ hand_empty_scale = 0.01
+ for marker_number in range(mediapipe_right_hand_fr_mar_xyz.shape[1]):
+ trajectory_name = mediapipe_right_hand_trajectory_names[marker_number]
+ trajectory_fr_xyz = mediapipe_right_hand_fr_mar_xyz[:, marker_number, :]
+ create_keyframed_empty_from_3d_trajectory_data(
+ trajectory_fr_xyz=trajectory_fr_xyz,
+ trajectory_name=trajectory_name,
+ parent_origin=freemocap_origin_axes,
+ empty_scale=hand_empty_scale,
+ empty_type="PLAIN_AXES",
+ )
+
+ # create empty markers for left hand
+ for marker_number in range(mediapipe_left_hand_fr_mar_xyz.shape[1]):
+ trajectory_name = mediapipe_left_hand_trajectory_names[marker_number]
+ trajectory_fr_xyz = mediapipe_left_hand_fr_mar_xyz[:, marker_number, :]
+ create_keyframed_empty_from_3d_trajectory_data(
+ trajectory_fr_xyz=trajectory_fr_xyz,
+ trajectory_name=trajectory_name,
+ parent_origin=freemocap_origin_axes,
+ empty_scale=hand_empty_scale,
+ empty_type="PLAIN_AXES",
+ )
+
+ # # create empty markers for face
+ # face_empty_scale = 0.005
+ # for marker_number in face_contour_marker_indices:
+ #
+ # if marker_number < len(mediapipe_face_trajectory_names):
+ # trajectory_name = mediapipe_face_trajectory_names[marker_number]
+ # else:
+ # trajectory_name = f"face_{marker_number}"
+ #
+ # trajectory_fr_xyz = mediapipe_face_fr_mar_xyz[:, marker_number, :]
+ # create_keyframed_empty_from_3d_trajectory_data(
+ # trajectory_fr_xyz=trajectory_fr_xyz,
+ # trajectory_name=trajectory_name,
+ # parent_origin=freemocap_origin_axes,
+ # empty_scale=face_empty_scale,
+ # empty_type="PLAIN_AXES",
+ # )
+
+ #######################################################################
+ # %% create virtual markers
+ print("_________________________\n"
+ "-------------------------\n"
+ "Creating virtual markers...")
+
+ # verify that the virtual marker definition dictionary is valid
+ test_virtual_marker_definitions(mediapipe_virtual_marker_definitions_dict)
+
+ virtual_marker_names = list(mediapipe_virtual_marker_definitions_dict.keys())
+ for virtual_marker_name in virtual_marker_names:
+ component_trajectory_names = mediapipe_virtual_marker_definitions_dict[virtual_marker_name]["marker_names"]
+ trajectory_weights = mediapipe_virtual_marker_definitions_dict[virtual_marker_name]["marker_weights"]
+
+ print(
+ f"Calculating virtual marker trajectory: {virtual_marker_name} \n"
+ f"Component trajectories: {component_trajectory_names} \n"
+ f" weights: {trajectory_weights}\n")
+
+ virtual_marker_xyz = calculate_virtual_marker_trajectory(
+ trajectory_3d_frame_marker_xyz=mediapipe_body_fr_mar_xyz,
+ all_trajectory_names=mediapipe_body_trajectory_names,
+ component_trajectory_names=component_trajectory_names,
+ trajectory_weights=trajectory_weights,
+ )
+ create_keyframed_empty_from_3d_trajectory_data(
+ trajectory_fr_xyz=virtual_marker_xyz,
+ trajectory_name=virtual_marker_name,
+ parent_origin=freemocap_origin_axes,
+ empty_scale=body_empty_scale * 3,
+ empty_type="PLAIN_AXES",
+ )
+
+ print(f"Adding virtual marker names to body trajectory names - {virtual_marker_names}")
+ mediapipe_body_trajectory_names.extend(virtual_marker_names)
+ print("Done creating virtual markers")
+
+ #######################################################################
+ # put sphere meshes on empty markers for visualization
+
+ # body
+ put_sphere_meshes_on_empties(
+ empty_names_list=mediapipe_body_trajectory_names,
+ parent_object=freemocap_origin_axes,
+ sphere_scale=body_empty_scale,
+ )
+
+ # create_stick_meshes_between_emtpies(
+ # body_frame_marker_xyz=mediapipe_body_fr_mar_xyz,
+ # empty_names=mediapipe_body_trajectory_names,
+ # body_connections=body_connections,
+ # parent_object=freemocap_origin_axes,
+ # )
+
+ # right hand
+ put_sphere_meshes_on_empties(
+ empty_names_list=mediapipe_right_hand_trajectory_names,
+ parent_object=freemocap_origin_axes,
+ sphere_scale=hand_empty_scale,
+ )
+
+ put_sphere_meshes_on_empties(
+ empty_names_list=mediapipe_left_hand_trajectory_names,
+ parent_object=freemocap_origin_axes,
+ sphere_scale=hand_empty_scale,
+ )
+
+ # # face
+ # put_sphere_meshes_on_empties(
+ # empty_names_list=mediapipe_face_trajectory_names,
+ # parent_object=freemocap_origin_axes,
+ # sphere_scale=face_empty_scale,
+ # )
+
+ ###########################
+ ### Make stick figure
+ creating_stick_figure_mesh_from_bone_dictionary(trajectory_frame_marker_xyz=mediapipe_body_fr_mar_xyz,
+ body_connections=body_connections,)
+ ############################
+ ### Load videos into scene
+ if Path(recording_path / "annotated_videos").is_dir():
+ videos_path = Path(recording_path / "annotated_videos")
+ elif Path(recording_path / "synchronized_videos").is_dir():
+ videos_path = Path(recording_path / "synchronized_videos")
+ else:
+ print("Did not find an `annotated_videos` or `synchronized_videos` folder in the recording path")
+ videos_path = None
+
+ if videos_path is not None:
+ try:
+ addon_utils.enable("io_import_images_as_planes")
+ except Exception as e:
+ print("Error enabling `io_import_images_as_planes` addon: ")
+ print(e)
+ try:
+ add_videos_to_scene(videos_path=videos_path, parent_object=world_origin_axes)
+ except Exception as e:
+ print("Error adding videos to scene: ")
+ print(e)
+
+ if create_rig:
+ try:
+ #######################################################################
+ ### Create meta-rig
+ print("Saving blender file with raw motion capture data before moving on to rigging")
+ bpy.ops.object.mode_set(mode="OBJECT")
+ bpy.ops.wm.save_as_mainfile(filepath=str(blender_file_save_path))
+
+ print(
+ "____________________________________________________________________________\n",
+ "Done loading in motion capture data - Now lets use it to drive an armature!\n"
+ "____________________________________________________________________________\n",
+ )
+
+ #######################################################################
+ ##% Activate necessary addons
+ addon_utils.enable("rigify")
+
+ ######################
+ ### Create Rigify human meta-rig
+ print(f"Creating `rigify human meta-rig`")
+ bpy.ops.object.armature_human_metarig_add()
+ human_metarig = bpy.context.editable_objects[-1]
+
+ ##################
+ ### Scale armature
+
+ bpy.ops.object.mode_set(mode="EDIT")
+
+ for (
+ segment_name,
+ rigify_bones_list,
+ ) in rigify_bone_to_skeleton_segment_name_correspondance.items():
+
+ for rigify_bone_name in rigify_bones_list:
+ median_segment_length = skeleton_segment_lengths_dict[segment_name]["median"]
+ median_segment_length *= 0.001 # scale to meters
+
+ segment_length = median_segment_length / len(
+ rigify_bones_list
+ ) # divide by number of bones in segment (for now, eventually will want to set weights
+ print(f"setting {rigify_bone_name} length to: {segment_length:.3f} m")
+ human_metarig.data.edit_bones[rigify_bone_name].length = segment_length
+
+ delete_bones = ["pelvis.L",
+ "pelvis.R",
+ "breast.L",
+ "breast.R",
+ "heel.02.L",
+ "heel.02.R",
+ "toe.L",
+ "toe.R", ]
+
+ for bone in delete_bones:
+ human_metarig.data.edit_bones.remove(human_metarig.data.edit_bones[bone])
+
+ extra_scale_bones = {"spine.005": .2}
+
+ for bone, scale in extra_scale_bones.items():
+ human_metarig.data.edit_bones[bone].length *= scale
+
+ ####
+ #### Constrain bones to empties
+ ####
+
+ # loop through dictionary applying constraints
+ bpy.ops.object.mode_set(mode="POSE")
+
+ for bone_name, bone_constraint_dict in rig_constraint_dict_of_dicts.items():
+ print(f"---Setting constraints for bone:{bone_name}---")
+ apply_constraints_to_bone(
+ bone_name=bone_name,
+ bone_constraint_dict=bone_constraint_dict,
+ armature_rig=human_metarig,
+ )
+
+ print(
+ "____________________________________________________________________________\n",
+ "Done constraining armature bones to follow keyframed empties!",
+ "____________________________________________________________________________",
+ )
+
+
+ except Exception as e:
+ print("Error creating rig!! (You might need to manually activate the `rigify` addon in Blender)")
+ print(e)
+
+ for window in bpy.context.window_manager.windows:
+ for area in window.screen.areas: # iterate through areas in current screen
+ if area.type == "VIEW_3D":
+ for space in area.spaces: # iterate through spaces in current VIEW_3D area
+ if space.type == "VIEW_3D": # check if space is a 3D view
+ space.shading.type = "MATERIAL"
+
+ # save .blend file
+ bpy.ops.object.mode_set(mode="OBJECT")
+ bpy.ops.wm.save_as_mainfile(filepath=str(blender_file_save_path))
+ print(f"Saved .blend file to: {blender_file_save_path}")
+
+ print("try to hide the shameful metarig and then save again lol")
+ human_metarig.hide_set = True
+ bpy.ops.wm.save_as_mainfile(filepath=str(blender_file_save_path))
+
+
+ print(
+ "____________________________________________________________________________\n",
+ "____________________________________________________________________________\n",
+ "Done creating Blender scene!\n",
+ f"Saved .blend file to: {blender_file_save_path}\n",
+ "You can now open the `.blend` file in Blender and play the animation!\n",
+ "____________________________________________________________________________\n",
+ "____________________________________________________________________________",
+ )
+
+
+def add_videos_to_scene(videos_path: Union[Path, str], parent_object: bpy.types.Object, vid_location_scale: float = 2):
+ print("loading videos as planes...")
+
+ number_of_videos = len(list(videos_path.glob("*.mp4")))
+ print(f"Found {number_of_videos} videos in {videos_path}")
+ for (
+ video_number,
+ video_path,
+ ) in enumerate(videos_path.glob("*.mp4")):
+ print(f"Adding video: {video_path.name} to scene")
+
+ bpy.ops.import_image.to_plane(
+ files=[{"name": video_path.name}],
+ directory=str(video_path.parent),
+ shader="EMISSION",
+ )
+ print(f"Added video: {video_path.name} to scene")
+ video_as_plane = bpy.context.editable_objects[-1]
+ print(f"video_as_plane: {video_as_plane}")
+ video_as_plane.name = "video_" + str(video_number)
+ print(f"video_as_plane.name: {video_as_plane.name}")
+ buffer = 1.1
+ vid_x = (video_number * buffer - np.mean(np.arange(0, number_of_videos))) * vid_location_scale
+
+ video_as_plane.location = [
+ vid_x,
+ vid_location_scale,
+ 1,
+ ]
+ video_as_plane.rotation_euler = [np.pi / 2, 0, 0]
+ video_as_plane.scale = [1] * 3
+ video_as_plane.parent = parent_object
+
+
+def create_keyframed_empty_from_3d_trajectory_data(
+ trajectory_fr_xyz: np.ndarray,
+ trajectory_name: str,
+ parent_origin: bpy.types.Object = None,
+ empty_scale: float = 0.1,
+ empty_type: str = "PLAIN_AXES",
+):
+ """
+ Create a key framed empty from 3d trajectory data
+ """
+ print(f"Creating keyframed empty from: {trajectory_name}...")
+ bpy.ops.object.empty_add(type=empty_type)
+ empty_object = bpy.context.editable_objects[-1]
+ empty_object.name = trajectory_name
+
+ empty_object.scale = [empty_scale] * 3
+
+ empty_object.parent = parent_origin
+
+ for frame_number in range(trajectory_fr_xyz.shape[0]):
+ empty_object.location = [
+ trajectory_fr_xyz[frame_number, 0],
+ trajectory_fr_xyz[frame_number, 1],
+ trajectory_fr_xyz[frame_number, 2],
+ ]
+
+ empty_object.keyframe_insert(data_path="location", frame=frame_number)
+
+
+def put_sphere_meshes_on_empties(
+ empty_names_list: list,
+ parent_object: bpy.types.Object,
+ sphere_scale: float = 0.02,
+):
+ """
+ put uv sphere meshes on the empties in `empty_names_list` with a scale of `sphere_scale`
+ """
+
+ for empty_name in empty_names_list:
+ bpy.ops.mesh.primitive_uv_sphere_add(segments=8, ring_count=8, scale=(sphere_scale, sphere_scale, sphere_scale))
+ sphere = bpy.context.editable_objects[-1]
+ sphere.name = f"{empty_name}_sphere"
+ sphere.parent = parent_object
+
+ constraint = sphere.constraints.new(type="COPY_LOCATION")
+ constraint.target = bpy.data.objects[empty_name]
+
+
+def create_stick_meshes_between_emtpies(body_frame_marker_xyz: np.ndarray,
+ empty_names: List[str],
+ body_connections: Dict[int, int],
+ parent_object: bpy.types.Object, ):
+ """make cylinder meshes between the empties as defined in `body_connections`"""
+ for origin_marker_index, target_marker_index in body_connections.items():
+ origin_marker_name = empty_names[origin_marker_index]
+ target_marker_name = empty_names[target_marker_index]
+
+ stick = create_stick_mesh()
+ stick = bpy.context.editable_objects[-1]
+ stick.name = f"{origin_marker_name}_to_{target_marker_name}"
+ stick.parent = parent_object
+
+ constraint = stick.constraints.new(type="COPY_LOCATION")
+ constraint.target = bpy.data.objects[origin_marker_name]
+
+ constraint = stick.constraints.new(type="DAMPED_TRACK")
+ constraint.target = bpy.data.objects[target_marker_name]
+ constraint.track_axis = "TRACK_Z"
+
+ for frame_number in range(body_frame_marker_xyz.shape[0]):
+ distance_between_markers = np.linalg.norm(
+ body_frame_marker_xyz[frame_number, origin_marker_index, :] -
+ body_frame_marker_xyz[frame_number, target_marker_index, :]
+ )
+ stick.scale = [1, 1, distance_between_markers]
+ stick.keyframe_insert(data_path="scale", frame=frame_number)
+
+
+def create_stick_mesh(vertices: int = 12,
+ radius: float = 0.02,
+ depth: float = 1.0,
+ location=(0, 0, 0),
+ rotation=(0, 0, 0),
+ scale=(1, 1, 1),
+ end_fill_type='TRIFAN',
+ enter_editmode=False,
+ align='WORLD'):
+ bpy.ops.mesh.primitive_cylinder_add(radius=radius,
+ depth=depth,
+ vertices=vertices,
+ location=location,
+ rotation=rotation,
+ scale=scale,
+ end_fill_type=end_fill_type,
+ enter_editmode=enter_editmode,
+ align=align)
+ # give 3dcursor new coordinates
+ bpy.context.scene.cursor.location = (0.0, 0.0, -0.5)
+
+ # set the origin on the current object to the 3dcursor location
+ bpy.ops.object.origin_set(type='ORIGIN_CURSOR')
+ return bpy.context.editable_objects[-1]
+
+
+def apply_constraints_to_bone(bone_name: str, bone_constraint_dict: dict, armature_rig):
+ """
+ Apply constraints to a bone (that exists in `armature_rig` based on a dictionary of constraints
+ """
+ for (
+ constraint_name,
+ constrain_parameters_dict,
+ ) in bone_constraint_dict.items():
+ constraint_name = constraint_name.split(".")[
+ 0
+ ] # for duplicated constraints, named `[constraint_name].001`, etc
+ print(f"constraint: {constraint_name} with parameters:{constrain_parameters_dict}")
+
+ bone = armature_rig.pose.bones[bone_name]
+ print(f"bone: {bone.name}")
+
+ constraint = bone.constraints.new(type=constraint_name)
+ print(f"constraint: {constraint.name}")
+
+ # generic constraint settings
+ if "target" in constrain_parameters_dict:
+
+ if constrain_parameters_dict["target"] == "armature":
+ constraint.target = armature_rig
+ constraint.subtarget = constrain_parameters_dict["subtarget"]
+ print(f"constraint.target: {constraint.target.name}")
+ print(f"constraint.subtarget: {constraint.target.name}")
+ else:
+ constraint.target = bpy.data.objects[
+ constrain_parameters_dict["target"]
+ ] # point constraint at relevant empty object
+ print(f"constraint.target: {constraint.target.name}")
+
+ if "influence" in constrain_parameters_dict:
+ constraint.influence = constrain_parameters_dict["influence"]
+ print(f"constraint.influence: {constraint.influence}")
+
+ # constraint-specific settings
+ if constraint_name == "IK":
+ constraint.chain_count = constrain_parameters_dict["chain_length"]
+ print(f"constraint.chain_count: {constraint.chain_count}")
+
+ if constraint_name == "LOCKED_TRACK":
+ constraint.track_axis = constrain_parameters_dict["track_axis"]
+ constraint.lock_axis = constrain_parameters_dict["lock_axis"]
+ print(f"constraint.track_axis: {constraint.track_axis}")
+ print(f"constraint.lock_axis: {constraint.lock_axis}")
+
+ if constraint_name == "DAMPED_TRACK":
+ if "track_axis" in constrain_parameters_dict:
+ constraint.track_axis = constrain_parameters_dict["track_axis"]
+ print(f"constraint.track_axis: {constraint.track_axis}")
+
+
+def test_virtual_marker_definitions(virtual_marker_definitions_dict: dict):
+ """
+ Validate the virtual marker definitions dictionary to ensure that there are the same number of marker names and weights, and that the weights sum to 1
+ """
+
+ for (
+ virtual_marker_name,
+ virtual_marker_definition,
+ ) in virtual_marker_definitions_dict.items():
+ assert len(virtual_marker_definition["marker_names"]) == len(
+ virtual_marker_definition["marker_weights"]
+ ), f"marker_names and marker_weights must be the same length for virtual marker {virtual_marker_name}"
+ assert (
+ sum(virtual_marker_definition["marker_weights"]) == 1
+ ), f"marker_weights must sum to 1 for virtual marker {virtual_marker_name}"
+
+
+def calculate_virtual_marker_trajectory(
+ trajectory_3d_frame_marker_xyz: np.ndarray,
+ all_trajectory_names: list,
+ component_trajectory_names: List,
+ trajectory_weights: List,
+) -> np.ndarray:
+ """
+ Create a virtual marker from a set of component markers. A 'Virtual Marker' is a 'fake' marker created by combining the data from 'real' (measured) marker/trajectory data
+ `trajectory_3d_frame_marker_xyz`: all trajectory data in a numpy array with shape [frame, marker, xyz]
+ `all_trajectory_names`: list of all trajectory names
+ `component_trajectory_names`: the trajectories we'll use to make this virtual marker
+ `trajectory_weights`: the weights we'll use to combine the compoenent trajectories into the virtual maker
+ """
+
+ # double check that the weights scale to one, otherwise this function will return screwy results
+ assert np.sum(trajectory_weights) == 1, "Error - Trajectory_weights must sum to 1!"
+ assert len(component_trajectory_names) == len(trajectory_weights), \
+ "Error - component_trajectory_names and trajectory_weights must be the same length!"
+ virtual_marker_xyz = np.zeros((trajectory_3d_frame_marker_xyz.shape[0], 3))
+
+ for trajectory_name, weight in zip(component_trajectory_names, trajectory_weights):
+ # pull out the trajectory data for this component trajectory and scale by it's `weight`
+ component_trajectory_xyz = copy(
+ trajectory_3d_frame_marker_xyz[:, all_trajectory_names.index(trajectory_name), :] * weight)
+
+ # add it to the virtual marker
+ virtual_marker_xyz += component_trajectory_xyz
+
+ return virtual_marker_xyz
+
+
+def creating_stick_figure_mesh_from_bone_dictionary(trajectory_frame_marker_xyz: np.ndarray,
+ body_connections: Dict[int, int]):
+ print("creating_stick_figure_mesh_from_bone_dictionary")
+
+ assert (
+ len(trajectory_frame_marker_xyz.shape) == 3), "trajectory_frame_marker_xyz must have three axes - [frame, marker, xyz] (e.g. skeleton data from a single frame"
+ mesh = bpy.data.meshes.new("stick_figure_mesh")
+
+ init_zero_vertices = np.zeros((trajectory_frame_marker_xyz.shape[1], 3))
+
+ edges = []
+ for head_index, tail_index in body_connections.items():
+ edges.append((head_index, tail_index))
+
+ mesh.from_pydata(init_zero_vertices, edges, [])
+ mesh.validate(verbose=True)
+ mesh.update()
+
+ skin_radius = .025
+ print(f"Skinning stick figure mesh with radius {skin_radius}...")
+ bpy.data.objects['stick_figure_mesh'].modifiers.new('stick_figure_mesh_skin', 'SKIN')
+ bpy.ops.transform.skin_resize(value=(skin_radius, skin_radius, skin_radius))
+
+ for frame_number in range(trajectory_frame_marker_xyz.shape[0]):
+ for vertex in mesh.vertices:
+ vertex.co = trajectory_frame_marker_xyz[frame_number, vertex.index, :]
+ vertex.keyframe_insert(data_path="co", frame=frame_number) # keyframe the vertex location
+ mesh.update()
+
+
+mediapipe_empty_names = {
+ # generated by: freemocap/core_processes/detecting_things_in_2d_images/mediapipe_stuff/mediapipe_skeleton_names_and_connections.py
+ 'body': ['nose',
+ 'left_eye_inner',
+ 'left_eye',
+ 'left_eye_outer',
+ 'right_eye_inner',
+ 'right_eye',
+ 'right_eye_outer',
+ 'left_ear',
+ 'right_ear',
+ 'mouth_left',
+ 'mouth_right',
+ 'left_shoulder',
+ 'right_shoulder',
+ 'left_elbow',
+ 'right_elbow',
+ 'left_wrist',
+ 'right_wrist',
+ 'left_pinky',
+ 'right_pinky',
+ 'left_index',
+ 'right_index',
+ 'left_thumb',
+ 'right_thumb',
+ 'left_hip',
+ 'right_hip',
+ 'left_knee',
+ 'right_knee',
+ 'left_ankle',
+ 'right_ankle',
+ 'left_heel',
+ 'right_heel',
+ 'left_foot_index',
+ 'right_foot_index'],
+ 'hand': ['wrist',
+ 'thumb_cmc',
+ 'thumb_mcp',
+ 'thumb_ip',
+ 'thumb_tip',
+ 'index_finger_mcp',
+ 'index_finger_pip',
+ 'index_finger_dip',
+ 'index_finger_tip',
+ 'middle_finger_mcp',
+ 'middle_finger_pip',
+ 'middle_finger_dip',
+ 'middle_finger_tip',
+ 'ring_finger_mcp',
+ 'ring_finger_pip',
+ 'ring_finger_dip',
+ 'ring_finger_tip',
+ 'pinky_mcp',
+ 'pinky_pip',
+ 'pinky_dip',
+ 'pinky_tip'],
+
+ 'face': ['right_eye',
+ 'left_eye',
+ 'nose_tip',
+ 'mouth_center',
+ 'right_ear_tragion',
+ 'left_ear_tragion']}
+
+# NOTE - numbers refer to the index of the name in the relevant list above
+body_connections = {15: 19,
+ 16: 18,
+ 18: 20,
+ 3: 7,
+ 14: 16,
+ 23: 24,
+ 28: 32,
+ 11: 12,
+ 27: 29,
+ 6: 8,
+ 24: 26,
+ 4: 5,
+ 5: 6,
+ 29: 31,
+ 12: 14,
+ 0: 4,
+ 9: 10,
+ 1: 2,
+ 30: 32,
+ 25: 27,
+ 26: 28,
+ 17: 19,
+ 2: 3,
+ 13: 15}
+
+hand_connections = {3: 4,
+ 0: 1,
+ 17: 18,
+ 13: 17,
+ 18: 19,
+ 5: 9,
+ 14: 15,
+ 9: 13,
+ 1: 2,
+ 10: 11,
+ 19: 20,
+ 6: 7,
+ 15: 16,
+ 2: 3,
+ 11: 12,
+ 7: 8}
+# boy howdy mediapipe did not make it easy to get this info...
+face_contour_marker_indices = [0, 7, 10, 13, 14, 17, 21, 33, 37, 39, 40, 46, 52, 53, 54, 55, 58, 61, 63, 65, 66, 67, 70,
+ 78, 80, 81, 82, 84, 87, 88, 91, 93, 95, 103, 105, 107, 109, 127, 132, 133, 136, 144, 145,
+ 146, 148, 149, 150, 152, 153, 154, 155, 157, 158, 159, 160, 161, 162, 163, 172, 173, 176,
+ 178, 181, 185, 191, 234, 246, 249, 251, 263, 267, 269, 270, 276, 282, 283, 284, 285, 288,
+ 291, 293, 295, 296, 297, 300, 308, 310, 311, 312, 314, 317, 318, 321, 323, 324, 332, 334,
+ 336, 338, 356, 361, 362, 365, 373, 374, 375, 377, 378, 379, 380, 381, 382, 384, 385, 386,
+ 387, 388, 389, 390, 397, 398, 400, 402, 405, 409, 415, 454, 466]
+
+mediapipe_virtual_marker_definitions_dict = {
+ "head_center": {
+ "marker_names": ["left_ear", "right_ear"],
+ "marker_weights": [0.5, 0.5],
+ },
+ "neck_center": {
+ "marker_names": ["left_shoulder", "right_shoulder"],
+ "marker_weights": [0.5, 0.5],
+ },
+ "trunk_center": {
+ "marker_names": ["left_shoulder", "right_shoulder", "left_hip", "right_hip"],
+ "marker_weights": [0.25, 0.25, 0.25, 0.25],
+ },
+ "hips_center": {
+ "marker_names": ["left_hip", "right_hip"],
+ "marker_weights": [0.5, 0.5],
+ },
+}
+
+# Skeleton segments names and the rigify bone names that they correspond to
+rigify_bone_to_skeleton_segment_name_correspondance = {
+ "lower_spine": ["spine", "spine.001"],
+ "upper_spine": ["spine.002", "spine.003"],
+ "head": ["spine.004", "spine.005", "spine.006"],
+ "left_hand": ["hand.L"],
+ "left_forearm": ["forearm.L"],
+ "left_upper_arm": ["upper_arm.L"],
+ "right_hand": ["hand.R"],
+ "right_forearm": ["forearm.R"],
+ "right_upper_arm": ["upper_arm.R"],
+ "left_thigh": ["thigh.L"],
+ "left_calf": ["shin.L"],
+ "left_foot": ["foot.L"],
+ "right_thigh": ["thigh.R"],
+ "right_calf": ["shin.R"],
+ "right_foot": ["foot.R"],
+}
+
+# A dictionary where the `keys` are rigify bone names and the `values` are bone constraints and their parameters.
+# NOTE - the `targets` must correspond to the `mediapipe_body_names` list above (or one of the virtural markers we'll make later)
+rig_constraint_dict_of_dicts = {
+ "spine": {
+ "COPY_LOCATION": {"target": "hips_center"},
+ },
+ "spine.003": {
+ "IK": {"target": "neck_center", "chain_length": 4},
+ },
+ "spine.004": {
+ "COPY_LOCATION": {"target": "neck_center"},
+ },
+ "spine.006": {
+ "IK": {"target": "head_center", "chain_length": 2},
+ },
+ "face": {
+ "COPY_LOCATION": {"target": "armature", "subtarget": "spine.006"},
+ "DAMPED_TRACK": {
+ "target": "head_center",
+ },
+ "LOCKED_TRACK": {
+ "target": "nose",
+ "track_axis": "TRACK_Z",
+ "lock_axis": "LOCK_Y",
+ "influence": 1.0,
+ },
+ "LOCKED_TRACK.001": {
+ "target": "left_ear",
+ "track_axis": "TRACK_Z",
+ "lock_axis": "LOCK_Z",
+ "influence": 1.0,
+ },
+ },
+ "shoulder.R": {
+ "COPY_LOCATION": {"target": "neck_center"},
+ "DAMPED_TRACK": {"target": "right_shoulder"},
+ },
+ "upper_arm.R": {
+ "DAMPED_TRACK": {"target": "right_elbow"},
+ },
+ "forearm.R": {
+ "DAMPED_TRACK": {"target": "right_wrist"},
+ },
+ "hand.R": {
+ "DAMPED_TRACK": {"target": "right_index"},
+ },
+ "shoulder.L": {
+ "COPY_LOCATION": {"target": "neck_center"},
+ "DAMPED_TRACK": {"target": "left_shoulder"},
+ },
+ "upper_arm.L": {
+ "DAMPED_TRACK": {"target": "left_elbow"},
+ },
+ "forearm.L": {
+ "DAMPED_TRACK": {"target": "left_wrist"},
+ },
+ "hand.L": {
+ "DAMPED_TRACK": {"target": "left_index"},
+ },
+ "thigh.R": {
+ "COPY_LOCATION": {"target": "right_hip"},
+ "DAMPED_TRACK": {"target": "right_knee"},
+ },
+ "shin.R": {
+ "DAMPED_TRACK": {"target": "right_ankle"},
+ },
+ "foot.R": {
+ "DAMPED_TRACK": {"target": "right_foot_index"},
+ },
+ "thigh.L": {
+ "COPY_LOCATION": {"target": "left_hip"},
+ "DAMPED_TRACK": {"target": "left_knee"},
+ },
+ "shin.L": {
+ "DAMPED_TRACK": {"target": "left_ankle"},
+ },
+ "foot.L": {
+ "DAMPED_TRACK": {"target": "left_foot_index"},
+ },
+}
+
+print(f"__name__: {__name__}")
+
+if __name__ == "__main__" or __name__ == "<run_path>":
+
+ # this is the part that actually runs the script
+
+ print(f"Running script to create Blender file from freemocap session data from script {__file__}")
+ try:
+ ##% Session path
+ # get session path as command line argument
+ argv = sys.argv
+ print(f"Received command line arguments: {argv}")
+ argv = argv[argv.index("--") + 1:]
+
+ recording_path_input = Path(argv[0])
+ blender_file_save_path_input = Path(argv[1])
+ create_rig_input = bool(argv[2])
+ except:
+ print("No command line arguments received, using hard-coded path instead :D")
+
+ ####
+ ### Change the path below (`recording_path_input`) to the path to your recording session folder
+ ####
+ recording_path_input = Path(
+ r"C:\Users\jonma\freemocap_data\recording_sessions\session_2023-02-15_08_46_43_wud\recording_08_47_25_gmt-5_wud"
+ )
+ blender_file_save_path_input = Path(recording_path_input) / f"{Path(recording_path_input).name}_.blend"
+ create_rig = True
+
+ main(recording_path=recording_path_input,
+ blender_file_save_path=blender_file_save_path_input,
+ mediapipe_empty_names=mediapipe_empty_names,
+ create_rig=create_rig_input,)
diff --git a/freemocap/core_processes/export_data/blender_stuff/call_blender_subprocess_methods.py b/freemocap/core_processes/export_data/blender_stuff/call_blender_subprocess_methods.py
new file mode 100644
index 00000000..c2d6f2e8
--- /dev/null
+++ b/freemocap/core_processes/export_data/blender_stuff/call_blender_subprocess_methods.py
@@ -0,0 +1,173 @@
+import logging
+import subprocess
+from pathlib import Path
+from typing import Union
+
+# blender_exe_path = (
+# r"C:\Users\jonma\Blender Foundation\stable\blender-3.1.0-windows-x64\blender.exe"
+# )
+# blender_exe_path = r"C:\Users\jonma\Blender Foundation\Blender 3.1\blender.exe"
+from freemocap.core_processes.detecting_things_in_2d_images.mediapipe_stuff.mediapipe_skeleton_names_and_connections import (
+ mediapipe_names_and_connections_dict,
+)
+from freemocap.system.paths_and_files_names import OUTPUT_DATA_FOLDER_NAME
+from freemocap.utilities.save_dictionary_to_json import save_dictionary_to_json
+
+logger = logging.getLogger(__name__)
+
+
+def call_blender_subprocess_cgtinker(
+ recording_folder_path: Union[str, Path],
+ blender_file_path: Union[str, Path],
+ blender_exe_path: Union[str, Path],
+):
+ path_to_this_py_file = Path(__file__).parent.resolve()
+
+ blender_script_path = path_to_this_py_file / "cgtinker_blendarmocap_load.py"
+
+ # freemocap_blender_megascript_path = (
+ # path_to_this_py_file / "freemocap_blender_megascript_take2.py"
+ # )
+
+ try:
+ blender_exe_path = Path(blender_exe_path)
+ if not blender_exe_path.exists():
+ raise FileNotFoundError(f"Could not find the blender executable at {blender_exe_path}")
+ except Exception as e:
+ logger.error(e)
+ return
+
+ command_list = [
+ str(blender_exe_path),
+ "--background",
+ "--python",
+ str(blender_script_path),
+ "--",
+ str(recording_folder_path),
+ str(blender_file_path),
+ "1", # bind to rig
+ "1", # load synchronized_videos
+ "9999", # timeout
+ "0", # load raw data
+ "1,", # load quick
+ ]
+
+ logger.info(f"Starting `blender` sub-process with this command: \n {command_list}")
+
+ blender_process = subprocess.Popen(command_list, shell=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ while True:
+ output = blender_process.stdout.readline()
+ if blender_process.poll() is not None:
+ break
+ if output:
+ print(output.strip().decode())
+
+ if blender_process.returncode == 0:
+ print("Blender returned an error:")
+ print(blender_process.stderr.read().decode())
+ logger.info(f"Done with blender stuff :D")
+
+
+def call_blender_subprocess_alpha_megascript(
+ recording_folder_path: Union[str, Path],
+ blender_file_path: Union[str, Path],
+ blender_exe_path: Union[str, Path],
+ good_clean_frame_number: int = 0,
+):
+ path_to_this_py_file = Path(__file__).parent.resolve()
+
+ freemocap_blender_megascript_path = (
+ path_to_this_py_file / "blender_bpy_export_scripts" / "alpha_freemocap_blender_megascript.py"
+ )
+
+ # freemocap_blender_megascript_path = (
+ # path_to_this_py_file / "freemocap_blender_megascript_take2.py"
+ # )
+
+ try:
+ blender_exe_path = Path(blender_exe_path)
+ if not blender_exe_path.exists():
+ raise FileNotFoundError(f"Could not find the blender executable at {blender_exe_path}")
+ except Exception as e:
+ logger.error(e)
+ return
+
+ command_list = [
+ str(blender_exe_path),
+ "--background",
+ "--python",
+ str(freemocap_blender_megascript_path),
+ "--",
+ str(recording_folder_path),
+ str(blender_file_path),
+ str(good_clean_frame_number),
+ ]
+
+ logger.info(f"Starting `blender` sub-process with this command: \n {command_list}")
+
+ blender_process = subprocess.Popen(command_list, shell=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ while True:
+ output = blender_process.stdout.readline()
+ if blender_process.poll() is not None:
+ break
+ if output:
+ print(output.strip().decode())
+
+ if blender_process.returncode == 0:
+ print("Blender returned an error:")
+ print(blender_process.stderr.read().decode())
+ logger.info(f"Done with blender stuff :D")
+
+
+def call_blender_subprocess_megascript_take2(
+ recording_folder_path: Union[str, Path],
+ blender_file_path: Union[str, Path],
+ blender_exe_path: Union[str, Path],
+):
+ path_to_this_py_file = Path(__file__).parent.resolve()
+
+ freemocap_blender_megascript_path = (
+ path_to_this_py_file / "blender_bpy_export_scripts" / "freemocap_blender_megascript_take2.py"
+ )
+
+ if not (
+ Path(recording_folder_path) / OUTPUT_DATA_FOLDER_NAME / "mediapipe_names_and_connections_dict.json"
+ ).is_file():
+ save_dictionary_to_json(
+ save_path=str(Path(recording_folder_path) / OUTPUT_DATA_FOLDER_NAME),
+ file_name="mediapipe_names_and_connections_dict.json",
+ dictionary=mediapipe_names_and_connections_dict,
+ )
+
+ try:
+ blender_exe_path = Path(blender_exe_path)
+ if not blender_exe_path.exists():
+ raise FileNotFoundError(f"Could not find the blender executable at {blender_exe_path}")
+ except Exception as e:
+ logger.error(e)
+ return
+
+ command_list = [
+ str(blender_exe_path),
+ "--background",
+ "--python",
+ str(freemocap_blender_megascript_path),
+ "--",
+ str(recording_folder_path),
+ str(blender_file_path),
+ ]
+
+ logger.info(f"Starting `blender` sub-process with this command: \n {command_list}")
+
+ blender_process = subprocess.Popen(command_list, shell=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ while True:
+ output = blender_process.stdout.readline()
+ if blender_process.poll() is not None:
+ break
+ if output:
+ print(output.strip().decode())
+
+ if blender_process.returncode == 0:
+ print("Blender returned an error:")
+ print(blender_process.stderr.read().decode())
+ logger.info(f"Done with blender stuff :D")
diff --git a/freemocap/core_processes/export_data/blender_stuff/export_to_blender.py b/freemocap/core_processes/export_data/blender_stuff/export_to_blender.py
new file mode 100644
index 00000000..63bda9fe
--- /dev/null
+++ b/freemocap/core_processes/export_data/blender_stuff/export_to_blender.py
@@ -0,0 +1,53 @@
+import logging
+from pathlib import Path
+from typing import Union
+
+from freemocap.core_processes.export_data.blender_stuff.call_blender_subprocess_methods import (
+ call_blender_subprocess_megascript_take2,
+ call_blender_subprocess_cgtinker,
+ call_blender_subprocess_alpha_megascript,
+)
+from freemocap.core_processes.export_data.blender_stuff.get_best_guess_of_blender_path import (
+ get_best_guess_of_blender_path,
+)
+
+logger = logging.getLogger(__name__)
+
+
+def export_to_blender(
+ recording_folder_path: Union[str, Path],
+ blender_file_path: Union[str, Path],
+ blender_exe_path: Union[str, Path] = get_best_guess_of_blender_path(),
+ method: str = "megascript_take2",
+):
+
+ logger.info(
+ f"Exporting session data to a Blender scene at: {str(blender_file_path)} using Blender executable at {str(blender_exe_path)}"
+ )
+
+ if method == "megascript_take2":
+ call_blender_subprocess_megascript_take2(
+ recording_folder_path=recording_folder_path,
+ blender_file_path=blender_file_path,
+ blender_exe_path=blender_exe_path,
+ )
+ elif method == "alpha_megascript":
+ call_blender_subprocess_alpha_megascript(
+ recording_folder_path=recording_folder_path,
+ blender_file_path=blender_file_path,
+ blender_exe_path=blender_exe_path,
+ )
+ elif method == "cgtinker":
+ call_blender_subprocess_cgtinker(
+ recording_folder_path=recording_folder_path,
+ blender_file_path=blender_file_path,
+ blender_exe_path=blender_exe_path,
+ )
+
+ logger.info(f"blender subprocess finished")
+
+
+if __name__ == "__main__":
+
+ recording_path = r"D:\Dropbox\FreeMoCapProject\FreeMocap_Data\old\sesh_2022-09-19_16_16_50_in_class_jsm"
+ export_to_blender(recording_path, recording_path)
diff --git a/src/blender_stuff/get_best_guess_of_blender_path.py b/freemocap/core_processes/export_data/blender_stuff/get_best_guess_of_blender_path.py
similarity index 74%
rename from src/blender_stuff/get_best_guess_of_blender_path.py
rename to freemocap/core_processes/export_data/blender_stuff/get_best_guess_of_blender_path.py
index 6a5ce0b4..ff51dd16 100644
--- a/src/blender_stuff/get_best_guess_of_blender_path.py
+++ b/freemocap/core_processes/export_data/blender_stuff/get_best_guess_of_blender_path.py
@@ -3,7 +3,6 @@ import platform
from pathlib import Path
from typing import Union
-from src.config.home_dir import os_independent_home_dir
logger = logging.getLogger(__name__)
@@ -25,13 +24,11 @@ def get_best_guess_of_blender_path():
if blender_exe_path is not None:
if not blender_exe_path.is_file():
- base_path = Path(os_independent_home_dir()) / "Blender Foundation"
+ base_path = Path(Path.home()) / "Blender Foundation"
blender_exe_path = guess_blender_exe_path_from_path(base_path)
if blender_exe_path is not None and blender_exe_path.is_file():
- logger.info(
- f"Windows machine detected - guessing that `blender` is installed at: {str(blender_exe_path)}"
- )
+ logger.info(f"Windows machine detected - guessing that `blender` is installed at: {str(blender_exe_path)}")
return str(blender_exe_path)
else:
@@ -41,7 +38,5 @@ def get_best_guess_of_blender_path():
return None
else:
- logger.info(
- f"Non-Windows machine detected - TODO - Test how this works on Mac/Linux"
- )
+ logger.info(f"Non-Windows machine detected - TODO - Test how this works on Mac/Linux")
return None
diff --git a/src/cameras/capture/opencv_camera/__init__.py b/freemocap/core_processes/post_process_skeleton_data/__init__.py
similarity index 100%
rename from src/cameras/capture/opencv_camera/__init__.py
rename to freemocap/core_processes/post_process_skeleton_data/__init__.py
diff --git a/src/core_processes/post_process_skeleton_data/estimate_skeleton_segment_lengths.py b/freemocap/core_processes/post_process_skeleton_data/estimate_skeleton_segment_lengths.py
similarity index 79%
rename from src/core_processes/post_process_skeleton_data/estimate_skeleton_segment_lengths.py
rename to freemocap/core_processes/post_process_skeleton_data/estimate_skeleton_segment_lengths.py
index 2d9ebd29..5f5530b2 100644
--- a/src/core_processes/post_process_skeleton_data/estimate_skeleton_segment_lengths.py
+++ b/freemocap/core_processes/post_process_skeleton_data/estimate_skeleton_segment_lengths.py
@@ -1,11 +1,8 @@
import logging
from pathlib import Path
-from typing import Union
import numpy as np
import pandas as pd
-import json
-
from rich import print
logger = logging.getLogger(__name__)
@@ -33,9 +30,7 @@ mediapipe_skeleton_segment_definitions = {
}
-def estimate_skeleton_segment_lengths(
- skeleton_dataframe: pd.DataFrame, skeleton_segment_definitions: dict
-) -> dict:
+def estimate_skeleton_segment_lengths(skeleton_dataframe: pd.DataFrame, skeleton_segment_definitions: dict) -> dict:
"""Estimate the length of each skeleton segment.
Args:
@@ -46,9 +41,7 @@ def estimate_skeleton_segment_lengths(
dict: Dictionary containing the estimated length of each skeleton segment.
"""
logger.debug("Estimating skeleton segment lengths (mm)...")
- skeleton_data_dictionary = create_skeleton_dictionary_from_skeleton_body_data_frame(
- skeleton_dataframe
- )
+ skeleton_data_dictionary = create_skeleton_dictionary_from_skeleton_body_data_frame(skeleton_dataframe)
skeleton_segment_lengths_dict = {}
for segment_name, segment_definition_dict in skeleton_segment_definitions.items():
@@ -75,27 +68,17 @@ def estimate_skeleton_segment_lengths(
# good ol pythag <3
segment_length_per_frame = np.sqrt(
- (proximal_x - distal_x) ** 2
- + (proximal_y - distal_y) ** 2
- + (proximal_z - distal_z) ** 2
+ (proximal_x - distal_x) ** 2 + (proximal_y - distal_y) ** 2 + (proximal_z - distal_z) ** 2
)
skeleton_segment_lengths_dict[segment_name] = {}
- skeleton_segment_lengths_dict[segment_name]["median"] = np.nanmedian(
- segment_length_per_frame
- )
- skeleton_segment_lengths_dict[segment_name]["mean"] = np.nanmean(
- segment_length_per_frame
- )
- skeleton_segment_lengths_dict[segment_name]["standard_deviation"] = np.nanstd(
- segment_length_per_frame
- )
+ skeleton_segment_lengths_dict[segment_name]["median"] = np.nanmedian(segment_length_per_frame)
+ skeleton_segment_lengths_dict[segment_name]["mean"] = np.nanmean(segment_length_per_frame)
+ skeleton_segment_lengths_dict[segment_name]["standard_deviation"] = np.nanstd(segment_length_per_frame)
return skeleton_segment_lengths_dict
-def create_virtual_markers(
- skeleton_data_dictionary, virtual_marker_name: str, marker_name_list: list
-) -> dict:
+def create_virtual_markers(skeleton_data_dictionary, virtual_marker_name: str, marker_name_list: list) -> dict:
# print(
# f"Creating virtual marker '{virtual_marker_name}' from markers: {marker_name_list}"
# )
@@ -109,15 +92,9 @@ def create_virtual_markers(
y.append(skeleton_data_dictionary[f"{marker_name}_y"])
z.append(skeleton_data_dictionary[f"{marker_name}_z"])
- skeleton_data_dictionary[f"{virtual_marker_name}_x"] = np.mean(
- np.asarray(x), axis=0
- )
- skeleton_data_dictionary[f"{virtual_marker_name}_y"] = np.mean(
- np.asarray(y), axis=0
- )
- skeleton_data_dictionary[f"{virtual_marker_name}_z"] = np.mean(
- np.asarray(z), axis=0
- )
+ skeleton_data_dictionary[f"{virtual_marker_name}_x"] = np.nanmean(np.asarray(x), axis=0)
+ skeleton_data_dictionary[f"{virtual_marker_name}_y"] = np.nanmean(np.asarray(y), axis=0)
+ skeleton_data_dictionary[f"{virtual_marker_name}_z"] = np.nanmean(np.asarray(z), axis=0)
return skeleton_data_dictionary
@@ -146,18 +123,6 @@ def create_skeleton_dictionary_from_skeleton_body_data_frame(
return skeleton_data_dictionary
-def save_skeleton_segment_lengths_to_json(
- save_path: Union[Path, str], skeleton_segment_lengths_dict: dict
-):
- logger.info("Saving skeleton segment lengths to JSON file...")
- json_file_path = Path(save_path) / "skeleton_segment_lengths.json"
-
- with open(json_file_path, "w") as file:
- json.dump(skeleton_segment_lengths_dict, file, indent=4)
-
- print(f"Saved skeleton segment lengths to: {json_file_path}")
-
-
if __name__ == "__main__":
path_to_skeleton_body_csv = Path(
r"D:\Dropbox\FreeMoCapProject\teddy_animation\FreeMocap_Data\sesh_2022-10-09_13_55_45_calib_and_take_1_alpha\output_data\mediapipe_body_3d_xyz.csv"
diff --git a/src/core_processes/post_process_skeleton_data/gap_fill_filter_and_origin_align_skeleton_data.py b/freemocap/core_processes/post_process_skeleton_data/gap_fill_filter_and_origin_align_skeleton_data.py
similarity index 74%
rename from src/core_processes/post_process_skeleton_data/gap_fill_filter_and_origin_align_skeleton_data.py
rename to freemocap/core_processes/post_process_skeleton_data/gap_fill_filter_and_origin_align_skeleton_data.py
index 0bd069fb..54fc40c3 100644
--- a/src/core_processes/post_process_skeleton_data/gap_fill_filter_and_origin_align_skeleton_data.py
+++ b/freemocap/core_processes/post_process_skeleton_data/gap_fill_filter_and_origin_align_skeleton_data.py
@@ -2,7 +2,6 @@
import logging
import sys
from pathlib import Path
-import pickle
from typing import Union
import numpy as np
@@ -10,7 +9,9 @@ import pandas as pd
from rich.progress import track
from scipy import signal
-from src.config.home_dir import (
+from freemocap.core_processes.detecting_things_in_2d_images.mediapipe_stuff.mediapipe_skeleton_names_and_connections import \
+ NUMBER_OF_MEDIAPIPE_BODY_MARKERS
+from freemocap.system.paths_and_files_names import (
CENTER_OF_MASS_FOLDER_NAME,
SEGMENT_CENTER_OF_MASS_NPY_FILE_NAME,
TOTAL_BODY_CENTER_OF_MASS_NPY_FILE_NAME,
@@ -19,9 +20,7 @@ from src.config.home_dir import (
logger = logging.getLogger(__name__)
-def find_good_clean_frame_reprojection_error_method(
- skeleton_3d_fr_mar_xyz, skeleton_reprojection_error_fr_mar
-):
+def find_good_clean_frame_reprojection_error_method(skeleton_3d_fr_mar_xyz, skeleton_reprojection_error_fr_mar):
"""
Find the frame with the fewest nans, scaled by reprojection error (i.e. hopefully a frame where all tracked points are visible and well tracked)
"""
@@ -30,12 +29,8 @@ def find_good_clean_frame_reprojection_error_method(
)
nans_per_frame = np.sum(np.isnan(skeleton_3d_fr_mar_xyz[:, :, 0]), axis=1)
- reprojection_error_per_frame = np.nanmedian(
- skeleton_reprojection_error_fr_mar, axis=1
- )
- marker_velocity_per_frame = np.nanmedian(
- np.abs(np.diff(skeleton_3d_fr_mar_xyz, axis=1)), axis=1
- )
+ reprojection_error_per_frame = np.nanmedian(skeleton_reprojection_error_fr_mar, axis=1)
+ marker_velocity_per_frame = np.nanmedian(np.abs(np.diff(skeleton_3d_fr_mar_xyz, axis=1)), axis=1)
marker_velocity_per_frame = np.nanmean(np.abs(marker_velocity_per_frame), axis=1)
print(f"nans_per_frame.shape: {nans_per_frame.shape}")
@@ -44,12 +39,8 @@ def find_good_clean_frame_reprojection_error_method(
# normalize errors by relevant thing
nans_per_frame_normalized = nans_per_frame / skeleton_3d_fr_mar_xyz.shape[1]
- reprojection_error_per_frame_normalized = (
- reprojection_error_per_frame / np.nanmedian(reprojection_error_per_frame)
- )
- marker_velocity_per_frame_normalized = marker_velocity_per_frame / np.nanmedian(
- marker_velocity_per_frame
- )
+ reprojection_error_per_frame_normalized = reprojection_error_per_frame / np.nanmedian(reprojection_error_per_frame)
+ marker_velocity_per_frame_normalized = marker_velocity_per_frame / np.nanmedian(marker_velocity_per_frame)
print(
f"nans_per_frame_normalized (mean, [standard_deviation] : {np.nanmean(nans_per_frame_normalized):.3f} [{np.nanstd(nans_per_frame_normalized):.3f}]"
@@ -62,52 +53,39 @@ def find_good_clean_frame_reprojection_error_method(
)
frame_cleanliness_score_where_low_scores_are_good = (
- nans_per_frame_normalized
- + reprojection_error_per_frame_normalized
- + marker_velocity_per_frame_normalized
+ nans_per_frame_normalized + reprojection_error_per_frame_normalized + marker_velocity_per_frame_normalized
)
- good_clean_frame_number = np.nanargmin(
- frame_cleanliness_score_where_low_scores_are_good
- )
+ good_clean_frame_number = np.nanargmin(frame_cleanliness_score_where_low_scores_are_good)
print(f"----estimated good_clean_frame_number: {good_clean_frame_number}----")
return good_clean_frame_number
# %%
-def fill_gaps_in_freemocap_data(freemocap_marker_data: np.ndarray) -> np.ndarray:
+def fill_gaps_in_freemocap_data(inputData_frame_marker_xyz: np.ndarray) -> np.ndarray:
"""
Takes in a 3d skeleton numpy array from freemocap and interpolates missing NaN values
TODO - refactor so it doesn't use a for loop (and maybe uses more sophisticated gap-fill methods?)
"""
- num_frames = freemocap_marker_data.shape[0]
- num_markers = freemocap_marker_data.shape[1]
-
- freemocap_interpolated_data = np.empty((num_frames, num_markers, 3))
-
- for marker in track(
- range(num_markers),
- description="Filling gaps (`nan` values) via linear interpolation",
- ):
- this_marker_skel3d_data = freemocap_marker_data[:, marker, :]
-
- df = pd.DataFrame(this_marker_skel3d_data)
- df2 = df.interpolate(
- method="linear", axis=0
- ) # use pandas interpolation methods to fill in missing data
- this_marker_interpolated_skel3d_array = np.array(df2)
- # replace the remaining NaN values (the ones that often happen at the start of the recording)
- this_marker_interpolated_skel3d_array = np.where(
- np.isfinite(this_marker_interpolated_skel3d_array),
- this_marker_interpolated_skel3d_array,
- np.nanmean(this_marker_interpolated_skel3d_array),
- )
- freemocap_interpolated_data[
- :, marker, :
- ] = this_marker_interpolated_skel3d_array
+ interpolatedData_frame_marker_xyz = inputData_frame_marker_xyz.copy()
+
+ for marker_number in range(interpolatedData_frame_marker_xyz.shape[1]):
+ trajectory_frame_xyz = inputData_frame_marker_xyz[:, marker_number, :]
- return freemocap_interpolated_data
+ if marker_number < NUMBER_OF_MEDIAPIPE_BODY_MARKERS:
+ df = pd.DataFrame(trajectory_frame_xyz).interpolate(method="linear", axis=0)
+ df.fillna(method="bfill", axis=0, inplace=True)
+ df.fillna(method="ffill", axis=0, inplace=True)
+
+ if np.any(np.isnan(df.to_numpy())):
+ raise ValueError("Nans still present after interpolation")
+ if np.any(np.isinf(df.to_numpy())):
+ raise ValueError("Infs still present after interpolation")
+
+ interpolatedData_frame_marker_xyz[:, marker_number, :] = df.to_numpy()
+
+ return interpolatedData_frame_marker_xyz
# %%
@@ -123,15 +101,12 @@ def butterworth_lowpass_zerolag_filter(data, cutoff, sampling_rate, order):
def butterworth_filter_skeleton(skeleton_3d_data, cutoff, sampling_rate, order):
"""Take in a 3d skeleton numpy array and calculate_center_of_mass a low pass butterworth filter on each marker in the data"""
- number_of_frames = skeleton_3d_data.shape[0]
- number_of_markers = skeleton_3d_data.shape[1]
- butterworth_filtered_data = np.empty((number_of_frames, number_of_markers, 3))
- for marker_number in range(number_of_markers):
+ butterworth_filtered_data = skeleton_3d_data.copy()
+
+ for marker_number in range(NUMBER_OF_MEDIAPIPE_BODY_MARKERS):
for dimension in range(3):
- butterworth_filtered_data[
- :, marker_number, dimension
- ] = butterworth_lowpass_zerolag_filter(
+ butterworth_filtered_data[:, marker_number, dimension] = butterworth_lowpass_zerolag_filter(
skeleton_3d_data[:, marker_number, dimension],
cutoff,
sampling_rate,
@@ -172,9 +147,7 @@ def find_matching_indices_in_lists(list_1, list_2, list_3, list_4):
# %%
-def find_best_velocity_guess(
- skeleton_velocity_data, skeleton_indices, velocity_guess, iteration_range
-):
+def find_best_velocity_guess(skeleton_velocity_data, skeleton_indices, velocity_guess, iteration_range):
"""
This function iterates over velocity data and tries to pare down to a single frame that has the closest velocity to 0 for all foot markers
"""
@@ -203,15 +176,9 @@ def find_best_velocity_guess(
right_heel_x_velocity_limits = find_velocity_values_within_limit(
skeleton_data_velocity_x_right_heel, velocity_guess
)
- right_toe_x_velocity_limits = find_velocity_values_within_limit(
- skeleton_data_velocity_x_right_toe, velocity_guess
- )
- left_heel_x_velocity_limits = find_velocity_values_within_limit(
- skeleton_data_velocity_x_left_heel, velocity_guess
- )
- left_toe_x_velocity_limits = find_velocity_values_within_limit(
- skeleton_data_velocity_x_left_toe, velocity_guess
- )
+ right_toe_x_velocity_limits = find_velocity_values_within_limit(skeleton_data_velocity_x_right_toe, velocity_guess)
+ left_heel_x_velocity_limits = find_velocity_values_within_limit(skeleton_data_velocity_x_left_heel, velocity_guess)
+ left_toe_x_velocity_limits = find_velocity_values_within_limit(skeleton_data_velocity_x_left_toe, velocity_guess)
# return a list of matching frame indices from the four lists generated above
matching_values = find_matching_indices_in_lists(
@@ -261,7 +228,7 @@ def find_best_velocity_guess(
def find_good_frame_recursive_guess_method(
- skeleton_data, skeleton_indices: list, initial_velocity_guess: float, debug=False
+ skeleton_data, skeleton_indices: list, initial_velocity_guess: float, debug=False
):
"""
Finds a frame (called the good frame) where the velocity of both feet are closest to 0
@@ -303,9 +270,9 @@ def normalize_vector(vector):
"""Take in a vector, normalize it"""
unit_vector = vector / np.linalg.norm(vector)
- vector_length = np.sqrt(np.sum(unit_vector**2))
+ vector_length = np.sqrt(np.sum(unit_vector ** 2))
assert (
- np.abs(vector_length - 1.0) < sys.float_info.epsilon
+ np.abs(vector_length - 1.0) < sys.float_info.epsilon
), f"Vector is not normalized: vector_length = {vector_length}"
return unit_vector
@@ -313,9 +280,7 @@ def normalize_vector(vector):
# %%
-def calculate_shoulder_center_XYZ_coordinates(
- single_frame_skeleton_data, left_shoulder_index, right_shoulder_index
-):
+def calculate_shoulder_center_XYZ_coordinates(single_frame_skeleton_data, left_shoulder_index, right_shoulder_index):
"""Take in the left and right shoulder indices, and calculate the shoulder center point"""
left_shoulder_point = single_frame_skeleton_data[left_shoulder_index, :]
right_shoulder_point = single_frame_skeleton_data[right_shoulder_index, :]
@@ -327,9 +292,7 @@ def calculate_shoulder_center_XYZ_coordinates(
# %%
-def calculate_mid_hip_XYZ_coordinates(
- single_frame_skeleton_data, left_hip_index, right_hip_index
-):
+def calculate_mid_hip_XYZ_coordinates(single_frame_skeleton_data, left_hip_index, right_hip_index):
"""Take in the left and right hip indices, and calculate the mid hip point"""
left_hip_point = single_frame_skeleton_data[left_hip_index, :]
right_hip_point = single_frame_skeleton_data[right_hip_index, :]
@@ -342,9 +305,9 @@ def calculate_mid_hip_XYZ_coordinates(
def calculate_mid_foot_XYZ_coordinate(
- single_frame_skeleton_data,
- left_heel_index,
- right_heel_index,
+ single_frame_skeleton_data,
+ left_heel_index,
+ right_heel_index,
):
"""Take in the primary and secondary foot indices, and calculate the mid foot point"""
right_foot_point = single_frame_skeleton_data[right_heel_index, :]
@@ -412,15 +375,13 @@ def calculate_rotation_matrix(vector1, vector2):
identity_matrix = np.identity(3)
vector_cross_product = np.cross(vector1, vector2)
vector_dot_product = np.dot(vector1, vector2)
- skew_symmetric_cross_product = calculate_skewed_symmetric_cross_product(
- vector_cross_product
- )
+ skew_symmetric_cross_product = calculate_skewed_symmetric_cross_product(vector_cross_product)
rotation_matrix = (
- identity_matrix
- + skew_symmetric_cross_product
- + (np.dot(skew_symmetric_cross_product, skew_symmetric_cross_product))
- * (1 - vector_dot_product)
- / (np.linalg.norm(vector_cross_product) ** 2)
+ identity_matrix
+ + skew_symmetric_cross_product
+ + (np.dot(skew_symmetric_cross_product, skew_symmetric_cross_product))
+ * (1 - vector_dot_product)
+ / (np.linalg.norm(vector_cross_product) ** 2)
)
return rotation_matrix
@@ -446,9 +407,7 @@ def rotate_skeleton_frame(this_frame_aligned_skeleton_data, rotation_matrix):
num_tracked_points = this_frame_aligned_skeleton_data.shape[0]
for i in range(num_tracked_points):
- this_frame_rotated_skeleton[i, :] = rotate_point(
- this_frame_aligned_skeleton_data[i, :], rotation_matrix
- )
+ this_frame_rotated_skeleton[i, :] = rotate_point(this_frame_aligned_skeleton_data[i, :], rotation_matrix)
return this_frame_rotated_skeleton
@@ -457,10 +416,10 @@ def rotate_skeleton_frame(this_frame_aligned_skeleton_data, rotation_matrix):
def calculate_skeleton_rotation_matrix(
- skeleton_right_vector: np.ndarray,
- skeleton_up_vector: np.ndarray,
- skeleton_forward_vector: np.ndarray,
- world_up_vector: str,
+ skeleton_right_vector: np.ndarray,
+ skeleton_up_vector: np.ndarray,
+ skeleton_forward_vector: np.ndarray,
+ world_up_vector: str,
):
"""Calculate the rotation matrix to align the skeleton to the world coordinate system"""
@@ -474,40 +433,34 @@ def calculate_skeleton_rotation_matrix(
z_hat = np.cross(x_hat, y_hat)
y_hat = np.cross(z_hat, x_hat)
- if (
- world_up_vector == "z"
- ): # biomechanics convention (assumes 'groundplane' is primary XY plane)
+ if world_up_vector == "z": # biomechanics convention (assumes 'groundplane' is primary XY plane)
rotation_matrix = np.array([x_hat, y_hat, z_hat])
- elif (
- world_up_vector == "y"
- ): # computer graphics convention (assumes 'viewingplane' is primary XY plane)
+ elif world_up_vector == "y": # computer graphics convention (assumes 'viewingplane' is primary XY plane)
rotation_matrix = np.array([x_hat, z_hat, y_hat])
- elif (
- world_up_vector == "x"
- ): # I don't know of anyone who uses X as vertical, but you do you boo
+ elif world_up_vector == "x": # I don't know of anyone who uses X as vertical, but you do you boo
rotation_matrix = np.array([z_hat, y_hat, x_hat])
else:
raise ValueError("world_up_vector must be one of 'x', 'y', or 'z'")
assert (
- np.dot(rotation_matrix[0, :], rotation_matrix[1, :]) < sys.float_info.epsilon
+ np.dot(rotation_matrix[0, :], rotation_matrix[1, :]) < sys.float_info.epsilon
), "x_hat and y_hat are not orthogonal"
assert (
- np.dot(rotation_matrix[1, :], rotation_matrix[2, :]) < sys.float_info.epsilon
+ np.dot(rotation_matrix[1, :], rotation_matrix[2, :]) < sys.float_info.epsilon
), "y_hat and z_hat are not orthogonal"
assert (
- np.dot(rotation_matrix[2, :], rotation_matrix[0, :]) < sys.float_info.epsilon
+ np.dot(rotation_matrix[2, :], rotation_matrix[0, :]) < sys.float_info.epsilon
), "z_hat and x_hat are not orthogonal"
return rotation_matrix
def rotate_align_skeleton(
- positive_x_reference_vector_on_the_skeleton: np.ndarray,
- positive_y_reference_vector_on_the_skeleton: np.ndarray,
- positive_z_reference_vector_on_the_skeleton: np.ndarray,
- world_up_vector: str,
- original_skeleton_np_array: np.ndarray,
+ positive_x_reference_vector_on_the_skeleton: np.ndarray,
+ positive_y_reference_vector_on_the_skeleton: np.ndarray,
+ positive_z_reference_vector_on_the_skeleton: np.ndarray,
+ world_up_vector: str,
+ original_skeleton_np_array: np.ndarray,
) -> np.ndarray:
"""
Find the rotation matrix needed to rotate the 'reference_vector_on_the_skeleton' to match the 'world_vector_to_align_skeleton_vector_to', and
@@ -528,38 +481,26 @@ def rotate_align_skeleton(
skeleton_forward_vector=positive_y_reference_vector_on_the_skeleton,
world_up_vector=world_up_vector,
)
- logger.info(
- f"Skeleton original rotation matrix: \n {str(skeleton_original_rotation_matrix)}"
- )
+ logger.info(f"Skeleton original rotation matrix: \n {str(skeleton_original_rotation_matrix)}")
skeleton_inverse_rotation_matrix = np.linalg.inv(skeleton_original_rotation_matrix)
- logger.info(
- f"Skeleton inverse rotation matrix: \n {skeleton_inverse_rotation_matrix}"
- )
+ logger.info(f"Skeleton inverse rotation matrix: \n {skeleton_inverse_rotation_matrix}")
- skeleton_z_vector_rotated = (
- positive_z_reference_vector_on_the_skeleton @ skeleton_inverse_rotation_matrix
- )
- original_z_vector_length = np.sqrt(
- np.sum(positive_z_reference_vector_on_the_skeleton**2)
- )
- rotated_up_vector_length = np.sqrt(np.sum(skeleton_z_vector_rotated**2))
+ skeleton_z_vector_rotated = positive_z_reference_vector_on_the_skeleton @ skeleton_inverse_rotation_matrix
+ original_z_vector_length = np.sqrt(np.sum(positive_z_reference_vector_on_the_skeleton ** 2))
+ rotated_up_vector_length = np.sqrt(np.sum(skeleton_z_vector_rotated ** 2))
assert (
- original_z_vector_length - rotated_up_vector_length < 1
+ original_z_vector_length - rotated_up_vector_length < 1
), f"Rotating the skeleton up vector changed its size -\ something went wrong (original_z_vector_length {original_z_vector_length} - rotated_up_vector_length {rotated_up_vector_length} = {original_z_vector_length - rotated_up_vector_length})"
- skeleton_left_vector_rotated = (
- positive_x_reference_vector_on_the_skeleton @ skeleton_inverse_rotation_matrix
- )
+ skeleton_left_vector_rotated = positive_x_reference_vector_on_the_skeleton @ skeleton_inverse_rotation_matrix
- rotated_left_vector_length = np.sqrt(np.sum(skeleton_left_vector_rotated**2))
- original_x_vector_length = np.sqrt(
- np.sum(positive_x_reference_vector_on_the_skeleton**2)
- )
+ rotated_left_vector_length = np.sqrt(np.sum(skeleton_left_vector_rotated ** 2))
+ original_x_vector_length = np.sqrt(np.sum(positive_x_reference_vector_on_the_skeleton ** 2))
assert (
- rotated_left_vector_length - original_x_vector_length < 1
+ rotated_left_vector_length - original_x_vector_length < 1
), f"Rotating the skeleton left vector changed its size - something went wrong (rotated_left_vector_length {rotated_left_vector_length} - original_x_vector_length {original_x_vector_length} = {rotated_left_vector_length - original_x_vector_length})"
print(
@@ -570,25 +511,20 @@ def rotate_align_skeleton(
)
rotated_skeleton_data_array = np.empty(original_skeleton_np_array.shape)
- for frame_number in track(
- range(original_skeleton_np_array.shape[0]), description="Rotating Skeleton..."
- ):
+ for frame_number in track(range(original_skeleton_np_array.shape[0]), description="Rotating Skeleton..."):
for point_number in range(original_skeleton_np_array.shape[1]):
rotated_point_xyz = (
- original_skeleton_np_array[frame_number, point_number, :]
- @ skeleton_inverse_rotation_matrix
+ original_skeleton_np_array[frame_number, point_number, :] @ skeleton_inverse_rotation_matrix
)
- rotated_skeleton_data_array[
- frame_number, point_number, :
- ] = rotated_point_xyz
+ rotated_skeleton_data_array[frame_number, point_number, :] = rotated_point_xyz
return rotated_skeleton_data_array
# %%
def align_skeleton_with_origin_mean_blob_method(
- skeleton_3d_frame_landmark_xyz: np.ndarray,
+ skeleton_3d_frame_landmark_xyz: np.ndarray,
) -> np.ndarray:
"""get stats of skeleton postions and align with origin and point upwards based on that"""
skeleton_3d_frame_landmark_xyz_og = skeleton_3d_frame_landmark_xyz.copy()
@@ -599,15 +535,9 @@ def align_skeleton_with_origin_mean_blob_method(
skel_median_z = np.nanmedian(skeleton_3d_frame_landmark_xyz[:, :, 2])
# translate the skeleton to the origin
- skeleton_3d_frame_landmark_xyz[:, :, 0] = (
- skeleton_3d_frame_landmark_xyz[:, :, 0] - skel_median_x
- )
- skeleton_3d_frame_landmark_xyz[:, :, 1] = (
- skeleton_3d_frame_landmark_xyz[:, :, 1] - skel_median_y
- )
- skeleton_3d_frame_landmark_xyz[:, :, 2] = (
- skeleton_3d_frame_landmark_xyz[:, :, 2] - skel_median_z
- )
+ skeleton_3d_frame_landmark_xyz[:, :, 0] = skeleton_3d_frame_landmark_xyz[:, :, 0] - skel_median_x
+ skeleton_3d_frame_landmark_xyz[:, :, 1] = skeleton_3d_frame_landmark_xyz[:, :, 1] - skel_median_y
+ skeleton_3d_frame_landmark_xyz[:, :, 2] = skeleton_3d_frame_landmark_xyz[:, :, 2] - skel_median_z
skeleton_3d_frame_landmark_xyz_translated = skeleton_3d_frame_landmark_xyz.copy()
@@ -631,7 +561,7 @@ def align_skeleton_with_origin_mean_blob_method(
def align_skeleton_with_origin_foot_spine_method(
- skeleton_data: np.ndarray, skeleton_indices: list, good_frame: int
+ skeleton_data: np.ndarray, skeleton_indices: list, good_frame: int
) -> np.ndarray:
"""
Takes in freemocap skeleton data and translates the skeleton to the origin, and then rotates the data
@@ -655,8 +585,8 @@ def align_skeleton_with_origin_foot_spine_method(
# the mid point between the two heels
midpoint_between_heels_xyz = np.mean(
good_skeleton_frame[
- [skeleton_indices.index("left_heel"), skeleton_indices.index("right_heel")],
- :,
+ [skeleton_indices.index("left_heel"), skeleton_indices.index("right_heel")],
+ :,
],
axis=0,
)
@@ -668,28 +598,26 @@ def align_skeleton_with_origin_foot_spine_method(
skeleton_data_zeroed[:, :, 2] -= midpoint_between_heels_xyz[2]
# rotate so left heel is on the +Y axis
- right_heel_vector = skeleton_data_zeroed[
- good_frame, skeleton_indices.index("right_heel"), :
- ]
+ right_heel_vector = skeleton_data_zeroed[good_frame, skeleton_indices.index("right_heel"), :]
# Rotating the skeleton so that the spine is aligned with +z
midpoint_between_hips_xyz = np.mean(
skeleton_data_zeroed[
- good_frame,
- [skeleton_indices.index("left_hip"), skeleton_indices.index("right_hip")],
- :,
+ good_frame,
+ [skeleton_indices.index("left_hip"), skeleton_indices.index("right_hip")],
+ :,
],
axis=0,
)
midpoint_between_toes_xyz = np.mean(
skeleton_data_zeroed[
- good_frame,
- [
- skeleton_indices.index("left_foot_index"),
- skeleton_indices.index("right_foot_index"),
- ],
- :,
+ good_frame,
+ [
+ skeleton_indices.index("left_foot_index"),
+ skeleton_indices.index("right_foot_index"),
+ ],
+ :,
],
axis=0,
)
@@ -767,16 +695,10 @@ def return_XYZ_coordinates_of_markers(freemocap_data, indices_list, frame):
# %%
-def build_virtual_trunk_marker(
- freemocap_data, list_of_indices, trunk_joint_connection, frame
-):
- trunk_marker_indices = return_indices_of_joints(
- list_of_indices, trunk_joint_connection
- )
+def build_virtual_trunk_marker(freemocap_data, list_of_indices, trunk_joint_connection, frame):
+ trunk_marker_indices = return_indices_of_joints(list_of_indices, trunk_joint_connection)
- trunk_XYZ_coordinates = return_XYZ_coordinates_of_markers(
- freemocap_data, trunk_marker_indices, frame
- )
+ trunk_XYZ_coordinates = return_XYZ_coordinates_of_markers(freemocap_data, trunk_marker_indices, frame)
trunk_proximal = (trunk_XYZ_coordinates[0] + trunk_XYZ_coordinates[1]) / 2
trunk_distal = (trunk_XYZ_coordinates[2] + trunk_XYZ_coordinates[3]) / 2
@@ -787,9 +709,7 @@ def build_virtual_trunk_marker(
# %%
-def build_mediapipe_skeleton(
- mediapipe_pose_data, segment_dataframe, mediapipe_indices
-) -> list:
+def build_mediapipe_skeleton(mediapipe_pose_data, segment_dataframe, mediapipe_indices) -> list:
"""This function takes in the mediapipe pose data array and the segment_conn_len_perc_dataframe.
For each frame of data, it loops through each segment we want to find and identifies the names
of the proximal and distal joints of that segment. Then it searches the mediapipe_indices list
@@ -802,9 +722,7 @@ def build_mediapipe_skeleton(
num_frames = mediapipe_pose_data.shape[0]
num_frame_range = range(num_frames)
- mediapipe_frame_segment_joint_XYZ = (
- []
- ) # empty list to hold all the skeleton XYZ coordinates/frame
+ mediapipe_frame_segment_joint_XYZ = [] # empty list to hold all the skeleton XYZ coordinates/frame
for frame in track(num_frame_range, description="Building a MediaPipe Skeleton"):
@@ -820,10 +738,10 @@ def build_mediapipe_skeleton(
mediapipe_pose_skeleton_coordinates = {}
for (
- segment,
- segment_info,
+ segment,
+ segment_info,
) in (
- segment_dataframe.iterrows()
+ segment_dataframe.iterrows()
): # iterate through the data frame by the segment name and all the info for that segment
if segment == "trunk":
@@ -853,9 +771,7 @@ def build_mediapipe_skeleton(
else:
proximal_joint_foot_name = "right_ankle"
- proximal_joint_foot_index = mediapipe_indices.index(
- proximal_joint_foot_name
- )
+ proximal_joint_foot_index = mediapipe_indices.index(proximal_joint_foot_name)
distal_joint_foot = segment_info["Joint_Connection"][1]
distal_joint_foot_index = mediapipe_indices.index(distal_joint_foot)
@@ -962,14 +878,12 @@ segment_COM_percentages = [
# %%
def calculate_segment_COM(
- segment_conn_len_perc_dataframe,
- skelcoordinates_frame_segment_joint_XYZ,
- num_frame_range,
+ segment_conn_len_perc_dataframe,
+ skelcoordinates_frame_segment_joint_XYZ,
+ num_frame_range,
):
segment_COM_frame_dict = []
- for frame in track(
- num_frame_range, description="Calculating Segment Center of Mass"
- ):
+ for frame in track(num_frame_range, description="Calculating Segment Center of Mass"):
segment_COM_dict = {}
for segment, segment_info in segment_conn_len_perc_dataframe.iterrows():
this_segment_XYZ = skelcoordinates_frame_segment_joint_XYZ[frame][segment]
@@ -980,7 +894,7 @@ def calculate_segment_COM(
this_segment_COM_length = segment_info["Segment_COM_Length"]
this_segment_COM = this_segment_proximal + this_segment_COM_length * (
- this_segment_distal - this_segment_proximal
+ this_segment_distal - this_segment_proximal
)
segment_COM_dict[segment] = this_segment_COM
segment_COM_frame_dict.append(segment_COM_dict)
@@ -991,30 +905,22 @@ def calculate_segment_COM(
def reformat_segment_COM(segment_COM_frame_dict, num_frame_range, num_segments):
- segment_COM_frame_imgPoint_XYZ = np.empty(
- [int(len(num_frame_range)), int(num_segments), 3]
- )
+ segment_COM_frame_imgPoint_XYZ = np.empty([int(len(num_frame_range)), int(num_segments), 3])
for frame in num_frame_range:
this_frame_skeleton = segment_COM_frame_dict[frame]
for joint_count, segment in enumerate(this_frame_skeleton.keys()):
- segment_COM_frame_imgPoint_XYZ[frame, joint_count, :] = this_frame_skeleton[
- segment
- ]
+ segment_COM_frame_imgPoint_XYZ[frame, joint_count, :] = this_frame_skeleton[segment]
return segment_COM_frame_imgPoint_XYZ
# %%
-def calculate_total_body_COM(
- segment_conn_len_perc_dataframe, segment_COM_frame_dict, num_frame_range
-):
+def calculate_total_body_COM(segment_conn_len_perc_dataframe, segment_COM_frame_dict, num_frame_range):
logger.info("Calculating Total Body Center of Mass")
totalBodyCOM_frame_XYZ = np.empty([int(len(num_frame_range)), 3])
- for frame in track(
- num_frame_range, description="Calculating Total Body Center of Mass..."
- ):
+ for frame in track(num_frame_range, description="Calculating Total Body Center of Mass..."):
this_frame_total_body_percentages = []
this_frame_skeleton = segment_COM_frame_dict[frame]
@@ -1023,9 +929,7 @@ def calculate_total_body_COM(
this_segment_COM = this_frame_skeleton[segment]
this_segment_COM_percentage = segment_info["Segment_COM_Percentage"]
- this_segment_total_body_percentage = (
- this_segment_COM * this_segment_COM_percentage
- )
+ this_segment_total_body_percentage = this_segment_COM * this_segment_COM_percentage
this_frame_total_body_percentages.append(this_segment_total_body_percentage)
this_frame_total_body_COM = np.nansum(this_frame_total_body_percentages, axis=0)
@@ -1040,10 +944,10 @@ def calculate_total_body_COM(
def build_anthropometric_dataframe(
- segments: list,
- joint_connections: list,
- segment_COM_lengths: list,
- segment_COM_percentages: list,
+ segments: list,
+ joint_connections: list,
+ segment_COM_lengths: list,
+ segment_COM_percentages: list,
) -> pd.DataFrame:
# load anthropometric data into a pandas dataframe
df = pd.DataFrame(
@@ -1067,9 +971,9 @@ def build_anthropometric_dataframe(
def calculate_center_of_mass(
- freemocap_marker_data_array: np.ndarray,
- pose_estimation_skeleton: list,
- anthropometric_info_dataframe: pd.DataFrame,
+ freemocap_marker_data_array: np.ndarray,
+ pose_estimation_skeleton: list,
+ anthropometric_info_dataframe: pd.DataFrame,
):
num_frames = freemocap_marker_data_array.shape[0]
num_frame_range = range(num_frames)
@@ -1078,9 +982,7 @@ def calculate_center_of_mass(
segment_COM_frame_dict = calculate_segment_COM(
anthropometric_info_dataframe, pose_estimation_skeleton, num_frame_range
)
- segment_COM_frame_imgPoint_XYZ = reformat_segment_COM(
- segment_COM_frame_dict, num_frame_range, num_segments
- )
+ segment_COM_frame_imgPoint_XYZ = reformat_segment_COM(segment_COM_frame_dict, num_frame_range, num_segments)
totalBodyCOM_frame_XYZ = calculate_total_body_COM(
anthropometric_info_dataframe, segment_COM_frame_dict, num_frame_range
)
@@ -1093,38 +995,20 @@ def calculate_center_of_mass(
# %%
-def are_there_feet_in_this_mediapipe_skeleton_data(
- skeleton3d_frame_landmark_xyz, mediapipe_landmark_names
-):
+def are_there_feet_in_this_mediapipe_skeleton_data(skeleton3d_frame_landmark_xyz, mediapipe_landmark_names):
number_of_frames = skeleton3d_frame_landmark_xyz.shape[0]
number_nan_left_heel = np.sum(
- np.isnan(
- skeleton3d_frame_landmark_xyz[
- :, mediapipe_landmark_names.index("left_heel"), 0
- ]
- )
+ np.isnan(skeleton3d_frame_landmark_xyz[:, mediapipe_landmark_names.index("left_heel"), 0])
)
number_nan_right_heel = np.sum(
- np.isnan(
- skeleton3d_frame_landmark_xyz[
- :, mediapipe_landmark_names.index("right_heel"), 0
- ]
- )
+ np.isnan(skeleton3d_frame_landmark_xyz[:, mediapipe_landmark_names.index("right_heel"), 0])
)
number_nan_left_toe = np.sum(
- np.isnan(
- skeleton3d_frame_landmark_xyz[
- :, mediapipe_landmark_names.index("left_foot_index"), 0
- ]
- )
+ np.isnan(skeleton3d_frame_landmark_xyz[:, mediapipe_landmark_names.index("left_foot_index"), 0])
)
number_nan_right_toe = np.sum(
- np.isnan(
- skeleton3d_frame_landmark_xyz[
- :, mediapipe_landmark_names.index("right_foot_index"), 0
- ]
- )
+ np.isnan(skeleton3d_frame_landmark_xyz[:, mediapipe_landmark_names.index("right_foot_index"), 0])
)
no_left_heel = number_nan_left_heel == number_of_frames
@@ -1139,38 +1023,37 @@ def are_there_feet_in_this_mediapipe_skeleton_data(
def gap_fill_filter_origin_align_3d_data_and_then_calculate_center_of_mass(
- skel3d_frame_marker_xyz: np.ndarray,
- skeleton_reprojection_error_fr_mar: np.ndarray,
- path_to_folder_where_we_will_save_this_data: [str, Path],
- # Filter the data, set the filtering options here
- sampling_rate: Union[float, int],
- cut_off: Union[float, int],
- order: Union[float, int],
- reference_frame_number: Union[float, int] = None,
+ raw_skel3d_frame_marker_xyz: np.ndarray,
+ skeleton_reprojection_error_fr_mar: np.ndarray,
+ path_to_folder_where_we_will_save_this_data: [str, Path],
+ # Filter the data, set the filtering options here
+ sampling_rate: Union[float, int],
+ cut_off: Union[float, int],
+ order: Union[float, int],
+ reference_frame_number: Union[float, int] = None,
+
):
- path_to_folder_where_we_will_save_this_data = Path(
- path_to_folder_where_we_will_save_this_data
- )
+ path_to_folder_where_we_will_save_this_data = Path(path_to_folder_where_we_will_save_this_data)
logger.info("Gap-filling data...")
# Interpolate the data
- freemocap_interpolated_data = fill_gaps_in_freemocap_data(skel3d_frame_marker_xyz)
+ processed_skel3d_frame_marker_xyz = fill_gaps_in_freemocap_data(raw_skel3d_frame_marker_xyz, )
logger.info(
f"Filtering data at with a {order}th order, zero-lag, low-pass Butterworth filter with a cut-off frequency of {cut_off} Hz..."
)
- butterworth_filtered_skeleton_data = butterworth_filter_skeleton(
- freemocap_interpolated_data, cut_off, sampling_rate, order
+ processed_skel3d_frame_marker_xyz = butterworth_filter_skeleton(
+ processed_skel3d_frame_marker_xyz, cut_off, sampling_rate, order
)
- # pin skeleton to origin (set to mean positin of skeletonin this recording)
- zeroed_skeleton_data = butterworth_filtered_skeleton_data.copy()
- zeroed_skeleton_data[:, :, 0] -= np.nanmean(zeroed_skeleton_data[:, :, 0])
- zeroed_skeleton_data[:, :, 1] -= np.nanmean(zeroed_skeleton_data[:, :, 1])
- zeroed_skeleton_data[:, :, 2] -= np.nanmean(zeroed_skeleton_data[:, :, 2])
-
- # TODO - align skeleton so feet are at Z-plane and head is facing up
- origin_aligned_freemocap_marker_data = zeroed_skeleton_data.copy()
+ # # pin skeleton to origin (set to mean positin of skeletonin this recording)
+ # zeroed_skeleton_data = butterworth_filtered_skeleton_data.copy()
+ # zeroed_skeleton_data[:, :, 0] -= np.nanmean(zeroed_skeleton_data[:, :, 0])
+ # zeroed_skeleton_data[:, :, 1] -= np.nanmean(zeroed_skeleton_data[:, :, 1])
+ # zeroed_skeleton_data[:, :, 2] -= np.nanmean(zeroed_skeleton_data[:, :, 2])
+ #
+ # # TODO - align skeleton so feet are at Z-plane and head is facing up
+ # origin_aligned_freemocap_marker_data = zeroed_skeleton_data.copy()
# logger.info("Aligning data to the origin...")
# reference_frame_number = find_good_clean_frame_reprojection_error_method(
@@ -1205,11 +1088,8 @@ def gap_fill_filter_origin_align_3d_data_and_then_calculate_center_of_mass(
logger.info("Saving Origin Aligned Data")
Path(path_to_folder_where_we_will_save_this_data).mkdir(parents=True, exist_ok=True)
np.save(
- str(
- path_to_folder_where_we_will_save_this_data
- / "mediaPipeSkel_3d_origin_aligned"
- ),
- origin_aligned_freemocap_marker_data,
+ str(path_to_folder_where_we_will_save_this_data / "mediaPipeSkel_3d_body_hands_face.npy"),
+ processed_skel3d_frame_marker_xyz,
)
# Calculate segment and total body COM
@@ -1217,22 +1097,16 @@ def gap_fill_filter_origin_align_3d_data_and_then_calculate_center_of_mass(
segments, joint_connections, segment_COM_lengths, segment_COM_percentages
)
skelcoordinates_frame_segment_joint_XYZ = build_mediapipe_skeleton(
- origin_aligned_freemocap_marker_data,
+ processed_skel3d_frame_marker_xyz,
anthropometric_info_dataframe,
mediapipe_landmark_names,
)
- (
- segment_COM_frame_dict,
- segment_COM_frame_imgPoint_XYZ,
- totalBodyCOM_frame_XYZ,
- ) = calculate_center_of_mass(
- origin_aligned_freemocap_marker_data,
+ (segment_COM_frame_dict, segment_COM_frame_imgPoint_XYZ, totalBodyCOM_frame_XYZ,) = calculate_center_of_mass(
+ processed_skel3d_frame_marker_xyz,
skelcoordinates_frame_segment_joint_XYZ,
anthropometric_info_dataframe,
)
- Path(
- path_to_folder_where_we_will_save_this_data / CENTER_OF_MASS_FOLDER_NAME
- ).mkdir(parents=True, exist_ok=True)
+ Path(path_to_folder_where_we_will_save_this_data / CENTER_OF_MASS_FOLDER_NAME).mkdir(parents=True, exist_ok=True)
np.save(
str(
path_to_folder_where_we_will_save_this_data
@@ -1251,7 +1125,7 @@ def gap_fill_filter_origin_align_3d_data_and_then_calculate_center_of_mass(
)
logger.info("Done with gap filling, filtering, aligning, and COM calculation")
- return origin_aligned_freemocap_marker_data
+ return processed_skel3d_frame_marker_xyz
if __name__ == "__main__":
@@ -1261,9 +1135,7 @@ if __name__ == "__main__":
skeleton_reprojection_error_fr_mar = np.load(
r"C:\Users\jonma\freemocap_data\session_10-15-2022-09_50_10\output_data\raw_data\mediapipe_3dData_numFrames_numTrackedPoints_reprojectionError.npy"
)
- output_data_folder_path = (
- r"C:\Users\jonma\freemocap_data\session_10-15-2022-09_50_10\output_data"
- )
+ output_data_folder_path = r"C:\Users\jonma\freemocap_data\session_10-15-2022-09_50_10\output_data"
gap_fill_filter_origin_align_3d_data_and_then_calculate_center_of_mass(
mediapipe_3d_frame_trackedPoint_xyz,
skeleton_reprojection_error_fr_mar=skeleton_reprojection_error_fr_mar,
diff --git a/src/cameras/detection/__init__.py b/freemocap/core_processes/process_motion_capture_videos/__init__.py
similarity index 100%
rename from src/cameras/detection/__init__.py
rename to freemocap/core_processes/process_motion_capture_videos/__init__.py
diff --git a/freemocap/core_processes/process_motion_capture_videos/process_recording_folder.py b/freemocap/core_processes/process_motion_capture_videos/process_recording_folder.py
new file mode 100644
index 00000000..483a6972
--- /dev/null
+++ b/freemocap/core_processes/process_motion_capture_videos/process_recording_folder.py
@@ -0,0 +1,156 @@
+import logging
+import multiprocessing
+from pathlib import Path
+
+import pandas as pd
+
+from freemocap.core_processes.detecting_things_in_2d_images.mediapipe_stuff.mediapipe_skeleton_names_and_connections import (
+ mediapipe_names_and_connections_dict,
+)
+from freemocap.system.paths_and_files_names import (
+ MEDIAPIPE_BODY_3D_DATAFRAME_CSV_FILE_NAME,
+ RAW_DATA_FOLDER_NAME,
+)
+from freemocap.core_processes.capture_volume_calibration.anipose_camera_calibration.get_anipose_calibration_object import (
+ load_anipose_calibration_toml_from_path,
+)
+from freemocap.core_processes.capture_volume_calibration.triangulate_3d_data import (
+ triangulate_3d_data,
+)
+from freemocap.core_processes.detecting_things_in_2d_images.mediapipe_stuff.convert_mediapipe_npy_to_csv import (
+ convert_mediapipe_npy_to_csv,
+)
+from freemocap.core_processes.detecting_things_in_2d_images.mediapipe_stuff.mediapipe_skeleton_detector import (
+ MediaPipeSkeletonDetector,
+)
+from freemocap.core_processes.post_process_skeleton_data.estimate_skeleton_segment_lengths import (
+ estimate_skeleton_segment_lengths,
+ mediapipe_skeleton_segment_definitions,
+)
+from freemocap.core_processes.post_process_skeleton_data.gap_fill_filter_and_origin_align_skeleton_data import (
+ gap_fill_filter_origin_align_3d_data_and_then_calculate_center_of_mass,
+)
+from freemocap.parameter_info_models.recording_processing_parameter_models import RecordingProcessingParameterModel
+
+from freemocap.tests.test_mediapipe_2d_data_shape import (
+ test_mediapipe_2d_data_shape,
+)
+from freemocap.tests.test_mediapipe_3d_data_shape import test_mediapipe_3d_data_shape
+from freemocap.utilities.save_dictionary_to_json import save_dictionary_to_json
+
+logger = logging.getLogger(__name__)
+
+
+def process_recording_folder(
+ recording_processing_parameter_model: RecordingProcessingParameterModel,
+ kill_event: multiprocessing.Event = None,
+):
+ """
+
+ Parameters
+ ----------
+ recording_processing_parameter_model : RecordingProcessingParameterModel
+ RecordingProcessingParameterModel object (contains all the paths and parameters necessary to process a session folder
+
+ """
+
+ rec = recording_processing_parameter_model # make it smol
+
+ if not Path(rec.recording_info_model.synchronized_videos_folder_path).exists():
+ raise FileNotFoundError(
+ f"Could not find synchronized_videos folder at {rec.recording_info_model.synchronized_videos_folder_path}"
+ )
+
+ logger.info("Detecting 2d skeletons...")
+ # 2d skeleton detection
+ mediapipe_skeleton_detector = MediaPipeSkeletonDetector(
+ parameter_model=rec.mediapipe_parameters_model,
+ )
+
+ mediapipe_2d_data = mediapipe_skeleton_detector.process_folder_full_of_videos(
+ rec.recording_info_model.synchronized_videos_folder_path,
+ Path(rec.recording_info_model.output_data_folder_path) / RAW_DATA_FOLDER_NAME,
+ kill_event=kill_event,
+ )
+
+ if kill_event is not None and kill_event.is_set():
+ return
+
+ assert test_mediapipe_2d_data_shape(
+ synchronized_videos_folder=rec.recording_info_model.synchronized_videos_folder_path,
+ mediapipe_2d_data_file_path=rec.recording_info_model.mediapipe_2d_data_npy_file_path,
+ )
+
+ logger.info("Triangulating 3d skeletons...")
+
+ assert rec.recording_info_model.calibration_toml_check, f"No calibration file found at: {rec.recording_info_model.calibration_toml_path}"
+ assert rec.recording_info_model.data2d_status_check, f"No mediapipe 2d data found at: {rec.recording_info_model.mediapipe_2d_data_npy_file_path}"
+
+ anipose_calibration_object = load_anipose_calibration_toml_from_path(
+ camera_calibration_data_toml_path=rec.recording_info_model.calibration_toml_path,
+ save_copy_of_calibration_to_this_path=rec.recording_info_model.path,
+ )
+ (raw_skel3d_frame_marker_xyz, skeleton_reprojection_error_fr_mar,) = triangulate_3d_data(
+ anipose_calibration_object=anipose_calibration_object,
+ mediapipe_2d_data=mediapipe_2d_data,
+ output_data_folder_path=rec.recording_info_model.raw_data_folder_path,
+ mediapipe_confidence_cutoff_threshold=rec.anipose_triangulate_3d_parameters_model.confidence_threshold_cutoff,
+ use_triangulate_ransac=rec.anipose_triangulate_3d_parameters_model.use_triangulate_ransac_method,
+ kill_event=kill_event,
+ )
+
+ if kill_event is not None and kill_event.is_set():
+ return
+
+ assert test_mediapipe_3d_data_shape(
+ synchronized_videos_folder=rec.recording_info_model.synchronized_videos_folder_path,
+ mediapipe_3d_data_npy_path=rec.recording_info_model.raw_mediapipe_3d_data_npy_file_path,
+ medipipe_reprojection_error_data_npy_path=rec.recording_info_model.mediapipe_reprojection_error_data_npy_file_path,
+ )
+
+ logger.info("Gap-filling, butterworth filtering, origin aligning 3d skeletons, then calculating center of mass ...")
+
+ skel3d_frame_marker_xyz = gap_fill_filter_origin_align_3d_data_and_then_calculate_center_of_mass(
+ raw_skel3d_frame_marker_xyz=raw_skel3d_frame_marker_xyz,
+ skeleton_reprojection_error_fr_mar=skeleton_reprojection_error_fr_mar,
+ path_to_folder_where_we_will_save_this_data=rec.recording_info_model.output_data_folder_path,
+ sampling_rate=rec.post_processing_parameters_model.framerate,
+ cut_off=rec.post_processing_parameters_model.butterworth_filter_parameters.cutoff_frequency,
+ order=rec.post_processing_parameters_model.butterworth_filter_parameters.order,
+ reference_frame_number=None,
+ )
+ assert test_mediapipe_3d_data_shape(
+ synchronized_videos_folder=rec.recording_info_model.synchronized_videos_folder_path,
+ mediapipe_3d_data_npy_path=rec.recording_info_model.mediapipe_3d_data_npy_file_path,
+ medipipe_reprojection_error_data_npy_path=rec.recording_info_model.mediapipe_reprojection_error_data_npy_file_path,
+ )
+
+ logger.info("Breaking up big `npy` into smaller bits and converting to `csv`...")
+ # break up big NPY and save out csv's
+ convert_mediapipe_npy_to_csv(
+ mediapipe_3d_frame_trackedPoint_xyz=skel3d_frame_marker_xyz,
+ output_data_folder_path=rec.recording_info_model.output_data_folder_path,
+ )
+
+ path_to_skeleton_body_csv = (
+ Path(rec.recording_info_model.output_data_folder_path) / MEDIAPIPE_BODY_3D_DATAFRAME_CSV_FILE_NAME
+ )
+ skeleton_dataframe = pd.read_csv(path_to_skeleton_body_csv)
+
+ logger.info("Estimating skeleton segment lengths...")
+ skeleton_segment_lengths_dict = estimate_skeleton_segment_lengths(
+ skeleton_dataframe=skeleton_dataframe,
+ skeleton_segment_definitions=mediapipe_skeleton_segment_definitions,
+ )
+
+ save_dictionary_to_json(
+ save_path=rec.recording_info_model.output_data_folder_path,
+ file_name="mediapipe_skeleton_segment_lengths.json",
+ dictionary=skeleton_segment_lengths_dict,
+ )
+
+ save_dictionary_to_json(
+ save_path=rec.recording_info_model.output_data_folder_path,
+ file_name="mediapipe_names_and_connections_dict.json",
+ dictionary=mediapipe_names_and_connections_dict,
+ )
diff --git a/src/cameras/multicam_manager/__init__.py b/freemocap/gui/__init__.py
similarity index 100%
rename from src/cameras/multicam_manager/__init__.py
rename to freemocap/gui/__init__.py
diff --git a/src/cameras/persistence/__init__.py b/freemocap/gui/qt/__init__.py
similarity index 100%
rename from src/cameras/persistence/__init__.py
rename to freemocap/gui/qt/__init__.py
diff --git a/src/cameras/persistence/video_writer/__init__.py b/freemocap/gui/qt/actions_and_menus/__init__.py
similarity index 100%
rename from src/cameras/persistence/video_writer/__init__.py
rename to freemocap/gui/qt/actions_and_menus/__init__.py
diff --git a/freemocap/gui/qt/actions_and_menus/actions.py b/freemocap/gui/qt/actions_and_menus/actions.py
new file mode 100644
index 00000000..6ed6740e
--- /dev/null
+++ b/freemocap/gui/qt/actions_and_menus/actions.py
@@ -0,0 +1,71 @@
+from PyQt6.QtGui import QAction
+
+
+CREATE_NEW_RECORDING_ACTION_NAME = "Create New Recording "
+LOAD_MOST_RECENT_RECORDING_ACTION_NAME = "Load Most Recent Recording..."
+LOAD_EXISTING_RECORDING_ACTION_NAME = "Load Existing Recording"
+IMPORT_VIDEOS_ACTION_NAME = "Import Videos..."
+KILL_THREADS_AND_PROCESSES_ACTION_NAME = "Kill Threads and Processes"
+REBOOT_GUI_ACTION_NAME = "Reboot GUI"
+EXIT_ACTION_NAME = "Exit"
+
+
+class Actions:
+ def __init__(self, freemocap_main_window):
+ # File
+ self.create_new_recording_action = QAction(CREATE_NEW_RECORDING_ACTION_NAME, parent=freemocap_main_window)
+ self.create_new_recording_action.setShortcut("Ctrl+N")
+ self.create_new_recording_action.triggered.connect(freemocap_main_window.handle_start_new_session_action)
+
+ self.load_most_recent_recording_action = QAction(
+ LOAD_MOST_RECENT_RECORDING_ACTION_NAME, parent=freemocap_main_window
+ )
+ self.load_most_recent_recording_action.setShortcut("Ctrl+D")
+ self.load_most_recent_recording_action.triggered.connect(
+ freemocap_main_window.handle_load_most_recent_recording
+ )
+
+ self.load_existing_recording_action = QAction(LOAD_EXISTING_RECORDING_ACTION_NAME, parent=freemocap_main_window)
+ self.load_existing_recording_action.setShortcut("Ctrl+O")
+ self.load_existing_recording_action.triggered.connect(freemocap_main_window.open_load_existing_recording_dialog)
+
+ self.import_videos_action = QAction(IMPORT_VIDEOS_ACTION_NAME, parent=freemocap_main_window)
+ self.import_videos_action.setShortcut("Ctrl+I")
+ self.import_videos_action.triggered.connect(freemocap_main_window.open_import_videos_dialog)
+
+ self.reboot_gui_action = QAction(REBOOT_GUI_ACTION_NAME, parent=freemocap_main_window)
+ self.reboot_gui_action.setShortcut("Ctrl+R")
+ self.reboot_gui_action.triggered.connect(freemocap_main_window.reboot_gui)
+
+ self.kill_running_threads_and_processes_action = QAction(
+ KILL_THREADS_AND_PROCESSES_ACTION_NAME, parent=freemocap_main_window
+ )
+ self.kill_running_threads_and_processes_action.setShortcut("Ctrl+K")
+ self.kill_running_threads_and_processes_action.triggered.connect(
+ freemocap_main_window.kill_running_threads_and_processes
+ )
+
+ self.exit_action = QAction("E&xit", parent=freemocap_main_window)
+ self.exit_action.setShortcut("Ctrl+Q")
+ self.exit_action.triggered.connect(freemocap_main_window.close)
+
+ # # Help
+ # open_docs_action = QAction("Open &Documentation", parent=main_window)
+ # about_us_action = QAction("&About Us", parent=main_window)
+ #
+ # # Navigation
+ # show_camera_control_panel_action = QAction("&1 - Show Camera Control Panel", parent=main_window)
+ # show_camera_control_panel_action.setShortcut("Ctrl+1")
+ #
+ # show_calibrate_capture_volume_panel_action = QAction(
+ # "&2 - Show Calibrate Capture Volume Panel", parent=main_window
+ # )
+ # show_calibrate_capture_volume_panel_action.setShortcut("Ctrl+2")
+ #
+ # show_motion_capture_videos_panel_action = QAction("&3 - Show Motion Capture Videos Panel", parent=main_window)
+ # show_motion_capture_videos_panel_action.setShortcut("Ctrl+3")
+ #
+ # # Support
+ # donate_action = QAction("&Donate", parent=main_window)
+ # send_usage_statistics_action = QAction("Send &User Statistics", parent=main_window)
+ # user_survey_action = QAction("&User Survey", parent=main_window)
diff --git a/freemocap/gui/qt/actions_and_menus/menu_bar.py b/freemocap/gui/qt/actions_and_menus/menu_bar.py
new file mode 100644
index 00000000..d3499568
--- /dev/null
+++ b/freemocap/gui/qt/actions_and_menus/menu_bar.py
@@ -0,0 +1,70 @@
+from PyQt6.QtWidgets import QMainWindow, QMenuBar
+
+from freemocap.gui.qt.actions_and_menus.actions import Actions
+
+
+class MenuBar(QMenuBar):
+ def __init__(self, actions: Actions, parent: QMainWindow = None):
+ super().__init__(parent=parent)
+
+ self._add_actions_to_file_menu(actions)
+
+ def _add_actions_to_file_menu(self, actions: Actions):
+ """
+ based mostly on: https://realpython.com/python-menus-toolbars/
+ """
+
+ # file menu
+ file_menu = self.addMenu("&File")
+
+ file_menu.addAction(actions.create_new_recording_action)
+ file_menu.addAction(actions.load_most_recent_recording_action)
+ file_menu.addAction(actions.load_existing_recording_action)
+ file_menu.addAction(actions.import_videos_action)
+ file_menu.addAction(actions.kill_running_threads_and_processes_action)
+ file_menu.addAction(actions.reboot_gui_action)
+ file_menu.addAction(actions.exit_action)
+ #
+ # # navigation menu
+ # navigation_menu = QMenu("Na&vigation", parent=self)
+ # self.addMenu(navigation_menu)
+ #
+ # navigation_menu.addAction(self._show_camera_control_panel_action)
+ # navigation_menu.addAction(self._show_calibrate_capture_volume_panel_action)
+ # navigation_menu.addAction(self._show_motion_capture_videos_panel_action)
+ #
+ # # help menu
+ # help_menu = QMenu("&Help", parent=self)
+ # self.addMenu(help_menu)
+ # help_menu.setEnabled(False)
+ #
+ # help_menu.addAction(self._open_docs_action)
+ # help_menu.addAction(self._about_us_action)
+ #
+ # # support menu
+ # support_menu = QMenu(
+ # "\U00002665 &Support the FreeMoCap Project", parent=self
+ # )
+ # support_menu.setEnabled(False)
+ # self.addMenu(support_menu)
+ #
+ # support_menu.addAction(self._donate_action)
+ # support_menu.addAction(self._send_usage_statistics_action)
+ # support_menu.addAction(self._user_survey_action)
+
+
+if __name__ == "__main__":
+ import sys
+ from PyQt6.QtWidgets import QApplication, QLabel
+
+ app = QApplication(sys.argv)
+ _main_window = QMainWindow()
+ _main_window.setCentralWidget(QLabel("Henlo fren"))
+ _menu_bar = MenuBar(parent=_main_window)
+ # _menu_bar = QMenuBar(parent=_main_window)
+ # _fake_menu = QMenu("&Fake Menu", parent=_menu_bar)
+ # _menu_bar.addMenu(_fake_menu)
+ # _fake_menu.addAction("Fake Action")
+ _main_window.setMenuBar(_menu_bar)
+ _main_window.show()
+ sys.exit(app.exec())
diff --git a/freemocap/gui/qt/freemocap_main.py b/freemocap/gui/qt/freemocap_main.py
new file mode 100644
index 00000000..aba8b273
--- /dev/null
+++ b/freemocap/gui/qt/freemocap_main.py
@@ -0,0 +1,55 @@
+import logging
+import signal
+import sys
+from pathlib import Path
+
+from PyQt6.QtCore import QTimer
+from PyQt6.QtWidgets import QApplication
+
+from freemocap.system.paths_and_files_names import (
+ get_freemocap_data_folder_path,
+)
+from freemocap.gui.qt.main_window.freemocap_main_window import FreemocapMainWindow, EXIT_CODE_REBOOT
+from freemocap.gui.qt.utilities.get_qt_app import get_qt_app
+from freemocap.system.user_data.pipedream_pings import PipedreamPings
+
+repo = Path(__file__).parent.parent.parent.parent
+sys.path.insert(0, str(repo))
+
+logger = logging.getLogger(__name__)
+
+
+def sigint_handler(*args):
+ """Handler for the SIGINT signal."""
+ QApplication.quit()
+
+
+def qt_gui_main():
+ logger.info("Starting main...")
+ signal.signal(signal.SIGINT, sigint_handler)
+ app = get_qt_app()
+ timer = QTimer()
+ timer.start(500)
+
+ pipedream_pings = PipedreamPings()
+
+ while True:
+ freemocap_main_window = FreemocapMainWindow(freemocap_data_folder_path=get_freemocap_data_folder_path(),
+ pipedream_pings=pipedream_pings)
+ freemocap_main_window.show()
+ timer.timeout.connect(freemocap_main_window.update)
+ error_code = app.exec()
+ logger.info(f"`main` exited with error code: {error_code}")
+ freemocap_main_window.close()
+
+ if not error_code == EXIT_CODE_REBOOT:
+ print(f"Thank you for using freemocap \U0001F480 \U00002764 \U00002728")
+ break
+
+ logger.info("`main` exited with the 'reboot' code, so let's reboot!")
+
+ sys.exit()
+
+
+if __name__ == "__main__":
+ qt_gui_main()
diff --git a/src/config/__init__.py b/freemocap/gui/qt/main_window/__init__.py
similarity index 100%
rename from src/config/__init__.py
rename to freemocap/gui/qt/main_window/__init__.py
diff --git a/freemocap/gui/qt/main_window/freemocap_main_window.py b/freemocap/gui/qt/main_window/freemocap_main_window.py
new file mode 100644
index 00000000..d41ccd29
--- /dev/null
+++ b/freemocap/gui/qt/main_window/freemocap_main_window.py
@@ -0,0 +1,508 @@
+import logging
+import multiprocessing
+import shutil
+import threading
+from copy import copy
+from pathlib import Path
+from time import sleep
+from typing import Union, List
+
+from PyQt6.QtCore import Qt, pyqtSlot
+from PyQt6.QtGui import QIcon
+from PyQt6.QtWidgets import (
+ QDockWidget,
+ QMainWindow,
+ QFileDialog,
+ QTabWidget, QLineEdit,
+)
+from skelly_viewer import SkellyViewer
+from skellycam import (
+ SkellyCamParameterTreeWidget,
+ SkellyCamWidget,
+ SkellyCamControllerWidget,
+)
+from tqdm import tqdm
+
+from freemocap.core_processes.export_data.blender_stuff.export_to_blender import (
+ export_to_blender,
+)
+from freemocap.gui.qt.actions_and_menus.actions import Actions
+from freemocap.gui.qt.actions_and_menus.menu_bar import MenuBar
+from freemocap.gui.qt.style_sheet.css_file_watcher import CSSFileWatcher
+from freemocap.gui.qt.style_sheet.set_css_style_sheet import apply_css_style_sheet
+from freemocap.gui.qt.utilities.get_qt_app import get_qt_app
+from freemocap.gui.qt.utilities.update_most_recent_recording_toml import (
+ update_most_recent_recording_toml,
+)
+from freemocap.gui.qt.widgets.active_recording_widget import ActiveRecordingInfoWidget
+from freemocap.gui.qt.widgets.camera_controller_group_box import CameraControllerGroupBox
+from freemocap.gui.qt.widgets.central_tab_widget import CentralTabWidget
+from freemocap.gui.qt.widgets.control_panel.control_panel_dock_widget import (
+ ControlPanelWidget,
+)
+from freemocap.gui.qt.widgets.control_panel.process_mocap_data_panel.process_motion_capture_data_panel import (
+ ProcessMotionCaptureDataPanel,
+)
+from freemocap.gui.qt.widgets.control_panel.visualization_control_panel import VisualizationControlPanel
+from freemocap.gui.qt.widgets.directory_view_widget import DirectoryViewWidget
+from freemocap.gui.qt.widgets.import_videos_window import ImportVideosWizard
+from freemocap.gui.qt.widgets.log_view_widget import LogViewWidget
+from freemocap.gui.qt.widgets.welcome_panel_widget import (
+ WelcomeToFreemocapPanel,
+)
+from freemocap.parameter_info_models.recording_info_model import (
+ RecordingInfoModel,
+)
+from freemocap.parameter_info_models.recording_processing_parameter_models import (
+ RecordingProcessingParameterModel,
+)
+from freemocap.system.paths_and_files_names import (
+ get_css_stylesheet_path,
+ get_freemocap_data_folder_path,
+ get_most_recent_recording_path,
+ PATH_TO_FREEMOCAP_LOGO_SVG,
+ get_blender_file_path,
+ get_recording_session_folder_path,
+ DIRECTORY_EMOJI_STRING,
+ GEAR_EMOJI_STRING,
+ COOL_EMOJI_STRING,
+)
+
+# reboot GUI method based on this - https://stackoverflow.com/a/56563926/14662833
+from freemocap.system.start_file import open_file
+from freemocap.system.user_data.pipedream_pings import PipedreamPings
+
+EXIT_CODE_REBOOT = -123456789
+
+logger = logging.getLogger(__name__)
+
+
+class FreemocapMainWindow(QMainWindow):
+ def __init__(
+ self,
+ freemocap_data_folder_path: Union[str, Path],
+ pipedream_pings: PipedreamPings,
+ parent=None,
+ ):
+
+ logger.info("Initializing QtGUIMainWindow")
+ super().__init__(parent=parent)
+
+ self.setGeometry(100, 100, 1280, 720)
+ self.setWindowIcon(QIcon(PATH_TO_FREEMOCAP_LOGO_SVG))
+ self.setWindowTitle("freemocap \U0001F480 \U00002728")
+
+ self._css_file_watcher = self._set_up_stylesheet()
+
+ self._freemocap_data_folder_path = freemocap_data_folder_path
+ self._pipedream_pings = pipedream_pings
+
+ self._kill_thread_event = multiprocessing.Event()
+
+ self._active_recording_info_widget = ActiveRecordingInfoWidget(parent=self)
+ self._active_recording_info_widget.new_active_recording_selected_signal.connect(
+ self._handle_new_active_recording_selected
+ )
+ self._directory_view_widget = self._create_directory_view_widget()
+ self._directory_view_widget.expand_directory_to_path(get_recording_session_folder_path())
+ self._directory_view_widget.new_active_recording_selected_signal.connect(
+ self._active_recording_info_widget.set_active_recording
+ )
+
+ self._actions = Actions(freemocap_main_window=self)
+
+ self._menu_bar = MenuBar(actions=self._actions, parent=self)
+ self.setMenuBar(self._menu_bar)
+
+ self.statusBar().showMessage(
+ "Watch the terminal output for status updates, we're working on integrating better status updates into the GUI")
+
+ self._central_tab_widget = self._create_central_tab_widget()
+ self.setCentralWidget(self._central_tab_widget)
+
+ self._tools_dock_widget = self._create_tools_dock_widget()
+ self.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea, self._tools_dock_widget)
+ self._tools_dock_tab_widget = QTabWidget(self)
+ self._tools_dock_widget.setWidget(self._tools_dock_tab_widget)
+
+ self._control_panel_dock_widget = self._create_control_panel_widget()
+ self._tools_dock_tab_widget.addTab(self._control_panel_dock_widget, f"Control Panel{GEAR_EMOJI_STRING}")
+
+ self._tools_dock_tab_widget.addTab(self._directory_view_widget, f"Directory View{DIRECTORY_EMOJI_STRING}")
+ self._tools_dock_tab_widget.addTab(
+ self._active_recording_info_widget, f"Active Recording Info{COOL_EMOJI_STRING}"
+ )
+
+ # self.addDockWidget(Qt.DockWidgetArea.LeftDockWidgetArea, self._directory_view_dock_widget)
+
+ # self._jupyter_console_widget = JupyterConsoleWidget(parent=self)
+ # jupyter_console_dock_widget = QDockWidget("Jupyter IPython Console", self)
+ # self.addDockWidget(
+ # Qt.DockWidgetArea.BottomDockWidgetArea, jupyter_console_dock_widget
+ # )
+ # jupyter_console_dock_widget.setWidget(self._jupyter_console_widget)
+
+ self._log_view_widget = LogViewWidget(parent=self)
+ log_view_dock_widget = QDockWidget("Log View", self)
+ self.addDockWidget(Qt.DockWidgetArea.BottomDockWidgetArea, log_view_dock_widget)
+ log_view_dock_widget.setWidget(self._log_view_widget)
+
+ def _create_tools_dock_widget(self):
+ tools_dock_widget = QDockWidget("Tools and Info", self)
+ tools_dock_widget.setAllowedAreas(Qt.DockWidgetArea.LeftDockWidgetArea | Qt.DockWidgetArea.RightDockWidgetArea)
+ tools_dock_widget.setFeatures(
+ QDockWidget.DockWidgetFeature.DockWidgetMovable | QDockWidget.DockWidgetFeature.DockWidgetFloatable
+ )
+ return tools_dock_widget
+
+ def _handle_videos_saved_to_this_folder_signal(self, folder_path: str):
+ logger.info(f"Videos saved to this folder signal received: {folder_path}")
+
+ self._active_recording_info_widget.set_active_recording(recording_folder_path=folder_path)
+
+ if (
+ self._controller_group_box.auto_process_videos_checked
+ and self._controller_group_box.mocap_videos_radio_button_checked
+ ):
+ logger.info("'Auto process videos' checkbox is checked - triggering 'Process Motion Capture Data' button")
+ self._process_motion_capture_data_panel.process_motion_capture_data_button.click()
+ elif self._controller_group_box.calibration_videos_radio_button_checked:
+ logger.info("Processing calibration videos")
+ self._process_motion_capture_data_panel.calibrate_from_active_recording(
+ charuco_square_size_mm=float(self._controller_group_box.charuco_square_size)
+ )
+
+ def _handle_processing_finished_signal(self):
+ logger.info("Processing finished")
+ if self._controller_group_box.auto_open_in_blender_checked and not self._kill_thread_event.is_set():
+ logger.info("'Auto process videos' checkbox is checked - triggering 'Create Blender Scene'")
+ self._export_active_recording_to_blender()
+
+ def handle_start_new_session_action(self):
+ # self._central_tab_widget.set_welcome_tab_enabled(True)
+ self._central_tab_widget.set_camera_view_tab_enabled(True)
+ self._central_tab_widget.setCurrentIndex(1)
+ self._controller_group_box.show()
+ self._skellycam_widget.detect_available_cameras()
+
+ def update(self):
+ super().update()
+
+ try:
+ if not self._skellycam_widget.is_recording:
+ self._controller_group_box.update_recording_name_string()
+ except Exception as e:
+ logger.exception(e)
+
+ def _set_up_stylesheet(self):
+ apply_css_style_sheet(self, get_css_stylesheet_path())
+ css_file_watcher = CSSFileWatcher(path_to_css_file=get_css_stylesheet_path(), parent=self)
+ return css_file_watcher
+
+ def _create_new_synchronized_videos_folder(self) -> str:
+ new_recording_folder_path = self._controller_group_box.get_new_recording_path()
+ logger.info(f"Creating new recording folder at: {new_recording_folder_path}")
+ self._active_recording_info_widget.set_active_recording(recording_folder_path=new_recording_folder_path)
+ return self._active_recording_info_widget.active_recording_info.synchronized_videos_folder_path
+
+ def _create_central_tab_widget(self):
+
+ self._welcome_to_freemocap_widget = WelcomeToFreemocapPanel(actions=self._actions, parent=self)
+
+ self._skellycam_widget = SkellyCamWidget(
+ self._create_new_synchronized_videos_folder,
+ parent=self,
+ )
+ self._skellycam_widget.videos_saved_to_this_folder_signal.connect(
+ self._handle_videos_saved_to_this_folder_signal
+ )
+
+ self._skellycam_controller_widget = SkellyCamControllerWidget(
+ self._skellycam_widget,
+ parent=self,
+ )
+
+ self._controller_group_box = CameraControllerGroupBox(
+ skellycam_controller=self._skellycam_controller_widget, parent=self
+ )
+
+ self._skelly_viewer_widget = SkellyViewer()
+
+ center_tab_widget = CentralTabWidget(
+ parent=self,
+ skelly_cam_widget=self._skellycam_widget,
+ camera_controller_widget=self._controller_group_box,
+ welcome_to_freemocap_widget=self._welcome_to_freemocap_widget,
+ skelly_viewer_widget=self._skelly_viewer_widget,
+ )
+
+ center_tab_widget.set_welcome_tab_enabled(True)
+ center_tab_widget.set_camera_view_tab_enabled(True)
+ center_tab_widget.set_visualize_data_tab_enabled(True)
+
+ return center_tab_widget
+
+ def _create_directory_view_widget(self):
+ return DirectoryViewWidget(
+ top_level_folder_path=self._freemocap_data_folder_path,
+ get_active_recording_info_callable=self._active_recording_info_widget.get_active_recording_info,
+ )
+
+ # def _create_tool_bar(self):
+ # self._calibration_control_panel = CalibrationControlPanel(
+ # get_active_recording_info_callable=self._active_recording_info_widget.get_active_recording_info,
+ # )
+ # self._process_motion_capture_data_panel = ProcessMotionCaptureDataPanel(
+ # recording_processing_parameters=RecordingProcessingParameterModel(),
+ # get_active_recording_info=self._active_recording_info_widget.get_active_recording_info,
+ # )
+ # self._process_motion_capture_data_panel.processing_finished_signal.connect(
+ # self._handle_processing_finished_signal
+ # )
+ # return ToolBar(calibration_control_panel=self._calibration_control_panel,
+ # process_motion_capture_data_panel=self._process_motion_capture_data_panel,
+ # visualize_data_widget=self._create_visualization_control_panel(),
+ # directory_view_widget=self._create_directory_view_widget(),
+ # parent=self)
+
+ def _create_control_panel_widget(self):
+
+ self._camera_configuration_parameter_tree_widget = SkellyCamParameterTreeWidget(self._skellycam_widget)
+
+ # self._calibration_control_panel = CalibrationControlPanel(
+ # get_active_recording_info_callable=self._active_recording_info_widget.get_active_recording_info,
+ # )
+
+ self._process_motion_capture_data_panel = ProcessMotionCaptureDataPanel(
+ recording_processing_parameters=RecordingProcessingParameterModel(),
+ get_active_recording_info=self._active_recording_info_widget.get_active_recording_info,
+ kill_thread_event=self._kill_thread_event,
+ )
+ self._process_motion_capture_data_panel.processing_finished_signal.connect(
+ self._handle_processing_finished_signal
+ )
+
+ self._visualization_control_panel = VisualizationControlPanel(parent=self)
+ self._visualization_control_panel.export_to_blender_button.clicked.connect(
+ self._export_active_recording_to_blender
+ )
+
+ return ControlPanelWidget(
+ camera_configuration_parameter_tree_widget=self._camera_configuration_parameter_tree_widget,
+ # calibration_control_panel=self._calibration_control_panel,
+ process_motion_capture_data_panel=self._process_motion_capture_data_panel,
+ visualize_data_widget=self._visualization_control_panel,
+ parent=self,
+ )
+
+ def _export_active_recording_to_blender(self):
+ recording_path = self._active_recording_info_widget.get_active_recording_info(return_path=True)
+
+ self._visualization_control_panel.get_user_selected_method_string()
+ export_to_blender(
+ recording_folder_path=recording_path,
+ blender_file_path=get_blender_file_path(recording_path),
+ method=self._visualization_control_panel.get_user_selected_method_string(),
+ )
+
+ if (
+ self._controller_group_box.auto_open_in_blender_checked
+ # or self._visualization_control_panel.open_in_blender_automatically_box_is_checked
+ ):
+ if Path(self._active_recording_info_widget.active_recording_info.blender_file_path).exists():
+ open_file(self._active_recording_info_widget.active_recording_info.blender_file_path)
+ else:
+ logger.error("Blender file does not exist! Did something go wrong in the `export_to_blender` call above?")
+
+ def _handle_new_active_recording_selected(self, recording_info_model: RecordingInfoModel):
+ logger.info(f"New active recording selected: {recording_info_model.path}")
+
+ # self._calibration_control_panel.update_calibrate_from_active_recording_button_text()
+
+ path = Path(recording_info_model.path)
+ path.mkdir(parents=True, exist_ok=True)
+
+ if str(path.parent) != get_recording_session_folder_path():
+ self._directory_view_widget.set_folder_as_root(path.parent)
+ else:
+ self._directory_view_widget.set_folder_as_root(path)
+
+ if Path(recording_info_model.synchronized_videos_folder_path).exists():
+ self._directory_view_widget.expand_directory_to_path(recording_info_model.synchronized_videos_folder_path)
+ else:
+ self._directory_view_widget.expand_directory_to_path(recording_info_model.path)
+
+ self._active_recording_info_widget.update_parameter_tree()
+ # self._recording_name_label.setText(f"Recording Name: {recording_info_model.name}")
+ self._update_skelly_viewer_widget()
+ self._directory_view_widget.handle_new_active_recording_selected()
+
+ try:
+ self._process_motion_capture_data_panel.update_calibration_path()
+ except Exception as e:
+ logger.error(e)
+
+
+
+ update_most_recent_recording_toml(recording_info_model=recording_info_model)
+
+ def _update_skelly_viewer_widget(self):
+ active_recording_info = self._active_recording_info_widget.active_recording_info
+
+
+ if active_recording_info.data3d_status_check:
+ self._skelly_viewer_widget.load_skeleton_data(
+ mediapipe_skeleton_npy_path=active_recording_info.mediapipe_3d_data_npy_file_path
+ )
+
+
+ if active_recording_info.data2d_status_check:
+ self._skelly_viewer_widget.generate_video_display(
+ video_folder_path=active_recording_info.annotated_videos_folder_path
+ )
+
+
+ elif active_recording_info.synchronized_videos_status_check:
+ self._skelly_viewer_widget.generate_video_display(
+ video_folder_path=active_recording_info.synchronized_videos_folder_path
+ )
+
+
+ def reboot_gui(self):
+ logger.info("Rebooting GUI... ")
+ get_qt_app().exit(EXIT_CODE_REBOOT)
+
+ def kill_running_threads_and_processes(self):
+ logger.info("Killing running threads and processes... ")
+ try:
+ self._skellycam_widget.close()
+ except Exception as e:
+ logger.error(f"Error killing running threads and processes: {e}")
+
+ self._kill_thread_event.set()
+
+ def handle_load_most_recent_recording(self):
+ logger.info("`Load Most Recent Recording` QAction triggered")
+ most_recent_recording_path = get_most_recent_recording_path()
+
+ if most_recent_recording_path is None:
+ logger.error(f"`get_most_recent_recording_path()` return `None`!")
+ return
+
+ self._active_recording_info_widget.set_active_recording(recording_folder_path=get_most_recent_recording_path())
+ self._central_tab_widget.setCurrentIndex(2)
+ self._control_panel_dock_widget.tab_widget.setCurrentWidget(self._process_motion_capture_data_panel)
+
+ def open_load_existing_recording_dialog(self):
+ # from this tutorial - https://www.youtube.com/watch?v=gg5TepTc2Jg&t=649s
+ logger.info("Opening `Load Existing Recording` dialog... ")
+ user_selected_directory = QFileDialog.getExistingDirectory(
+ self,
+ "Select a recording folder",
+ str(get_recording_session_folder_path()),
+ )
+ if len(user_selected_directory) == 0:
+ logger.info("User cancelled `Load Existing Recording` dialog")
+ return
+
+ user_selected_directory = user_selected_directory[0]
+ logger.info(f"User selected recording path:{user_selected_directory}")
+
+ self._active_recording_info_widget.set_active_recording(recording_folder_path=user_selected_directory)
+
+ def open_import_videos_dialog(self):
+ # from this tutorial - https://www.youtube.com/watch?v=gg5TepTc2Jg&t=649s
+ logger.info("Opening `Import Videos` dialog... ")
+
+ import_videos_path = QFileDialog.getExistingDirectory(
+ self,
+ "Select a folder containing synchronized videos (each video must have *exactly* the same number of frames)",
+ str(Path.home()),
+ )
+
+ if len(import_videos_path) == 0:
+ logger.info("User cancelled `Import Videos` dialog")
+ return
+
+ self._import_videos_window = ImportVideosWizard(parent=self,
+ import_videos_path=import_videos_path,
+ )
+ self._import_videos_window.folder_to_save_videos_to_selected.connect(self._handle_import_videos)
+ text = self._import_videos_window.exec()
+
+
+ @pyqtSlot(list, str)
+ def _handle_import_videos(self, video_paths: List[str], folder_to_save_videos: str):
+
+ folder_to_save_videos = Path(folder_to_save_videos)
+ folder_to_save_videos.mkdir(parents=True, exist_ok=True)
+
+ if len(video_paths) == 0:
+ logger.error("No videos to import!")
+ return
+
+ for video_path in tqdm(video_paths,
+ desc="Importing videos...",
+ colour=[255, 128, 0],
+ unit="video",
+ unit_scale=True,
+ leave=False
+ ):
+
+ if not Path(video_path).exists():
+ logger.error(f"{video_path} does not exist!")
+ return
+
+ destination_path = folder_to_save_videos / Path(video_path).name
+ logger.info(f"Copying video from {video_path} to {destination_path}")
+
+ shutil.copy(video_path, destination_path)
+
+ self._active_recording_info_widget.set_active_recording(
+ recording_folder_path=Path(folder_to_save_videos).parent)
+
+ def closeEvent(self, a0) -> None:
+ logger.info("Main window `closeEvent` detected")
+
+ self._pipedream_pings.update_pings_dict(key="gui_closed", value=True)
+ self._pipedream_pings.update_pings_dict(key="active recording status on close", value=self._active_recording_info_widget.active_recording_info.status_check)
+ self._pipedream_pings.send_pipedream_ping()
+
+ remove_empty_directories(get_recording_session_folder_path())
+
+ try:
+ self._skellycam_widget.close()
+ except Exception as e:
+ logger.error(f"Error while closing the viewer widget: {e}")
+ super().closeEvent(a0)
+
+
+def remove_empty_directories(root_dir: Union[str, Path]):
+ """
+ Recursively remove empty directories from the root directory
+ :param root_dir: The root directory to start removing empty directories from
+ """
+ # logger.debug(f"Searching for empty directories in: {root_dir}")
+ for path in Path(root_dir).rglob("*"):
+ if path.is_dir() and not any(path.iterdir()):
+ logger.info(f"Removing empty directory: {path}")
+ path.rmdir()
+ elif path.is_dir() and any(path.iterdir()):
+ remove_empty_directories(path)
+ else:
+ continue
+
+
+if __name__ == "__main__":
+ import sys
+
+ from PyQt6.QtWidgets import QApplication
+
+ app = QApplication(sys.argv)
+ main_window = FreemocapMainWindow(pipedream_pings=PipedreamPings())
+ main_window.show()
+ app.exec()
+ for process in multiprocessing.active_children():
+ logger.info(f"Terminating process: {process}")
+ process.terminate()
+ sys.exit()
diff --git a/freemocap/gui/qt/style_sheet/AMOLED.qss b/freemocap/gui/qt/style_sheet/AMOLED.qss
new file mode 100644
index 00000000..12737962
--- /dev/null
+++ b/freemocap/gui/qt/style_sheet/AMOLED.qss
@@ -0,0 +1,577 @@
+/*
+AMOLED Style Sheet for QT Applications
+Author: Jaime A. Quiroga P.
+Company: GTRONICK
+Last updated: 01/10/2021, 15:49.
+Available at: https://github.com/GTRONICK/QSS/blob/master/AMOLED.qss
+*/
+QMainWindow {
+ background-color: #d00e0e;
+}
+QDialog {
+ background-color: #b00505;
+}
+QColorDialog {
+ background-color:#000000;
+}
+QTextEdit {
+ background-color:#000000;
+ color: #a9b7c6;
+}
+QPlainTextEdit {
+ selection-background-color:#f39c12;
+ background-color:#000000;
+ border: 1px solid #FF00FF;
+ color: #a9b7c6;
+}
+QPushButton{
+ border: 1px transparent;
+ color: #a9b7c6;
+ padding: 2px;
+ background-color: #670b8c;
+ border-radius: 20px;
+}
+QPushButton::default{
+ border-style: solid;
+ border-top-color: transparent;
+ border-right-color: transparent;
+ border-left-color: transparent;
+ border-bottom-color: #e06b04;
+ border-width: 1px;
+ color: #a9b7c6;
+ padding: 2px;
+ background-color: #000000;
+}
+QPushButton:hover{
+ border-style: solid;
+ border-top-color: transparent;
+ border-right-color: transparent;
+ border-left-color: transparent;
+ border-bottom-color: #FF00FF;
+ border-bottom-width: 1px;
+ border-bottom-radius: 6px;
+ border-style: solid;
+ color: #FFFFFF;
+ padding-bottom: 2px;
+ background-color: #000000;
+}
+QPushButton:pressed{
+ border-style: solid;
+ border-top-color: transparent;
+ border-right-color: transparent;
+ border-left-color: transparent;
+ border-bottom-color: #FF00FF;
+ border-bottom-width: 2px;
+ border-bottom-radius: 6px;
+ border-style: solid;
+ color: #e67e22;
+ padding-bottom: 1px;
+ background-color: #000000;
+}
+QPushButton:disabled{
+ border-style: solid;
+ border-top-color: transparent;
+ border-right-color: transparent;
+ border-left-color: transparent;
+ border-bottom-color: transparent;
+ border-bottom-width: 2px;
+ border-bottom-radius: 6px;
+ border-style: solid;
+ color: #808086;
+ padding-bottom: 1px;
+ background-color: #000000;
+}
+QToolButton {
+ border-style: solid;
+ border-top-color: transparent;
+ border-right-color: transparent;
+ border-left-color: transparent;
+ border-bottom-color: #e67e22;
+ border-bottom-width: 1px;
+ border-style: solid;
+ color: #a9b7c6;
+ padding: 2px;
+ background-color: #000000;
+}
+QToolButton:hover{
+ border-style: solid;
+ border-top-color: transparent;
+ border-right-color: transparent;
+ border-left-color: transparent;
+ border-bottom-color: #e67e22;
+ border-bottom-width: 2px;
+ border-bottom-radius: 6px;
+ border-style: solid;
+ color: #FFFFFF;
+ padding-bottom: 1px;
+ background-color: #000000;
+}
+QLineEdit {
+ border-width: 1px; border-radius: 4px;
+ border-color: rgb(58, 58, 58);
+ border-style: inset;
+ padding: 0 8px;
+ color: #a9b7c6;
+ background:#000000;
+ selection-background-color:#007b50;
+ selection-color: #FFFFFF;
+}
+QLabel {
+ color: #a9b7c6;
+}
+QLCDNumber {
+ color: #e67e22;
+}
+QProgressBar {
+ text-align: center;
+ color: rgb(240, 240, 240);
+ border-width: 1px;
+ border-radius: 10px;
+ border-color: rgb(58, 58, 58);
+ border-style: inset;
+ background-color:#000000;
+}
+QProgressBar::chunk {
+ background-color: #e67e22;
+ border-radius: 5px;
+}
+QMenu{
+ background-color:#000000;
+}
+QMenuBar {
+ background:rgb(0, 0, 0);
+ color: #a9b7c6;
+}
+QMenuBar::item {
+ spacing: 3px;
+ padding: 1px 4px;
+ background: transparent;
+}
+QMenuBar::item:selected {
+ border-style: solid;
+ border-top-color: transparent;
+ border-right-color: transparent;
+ border-left-color: transparent;
+ border-bottom-color: #e67e22;
+ border-bottom-width: 1px;
+ border-bottom-radius: 6px;
+ border-style: solid;
+ color: #FFFFFF;
+ padding-bottom: 0px;
+ background-color: #000000;
+}
+QMenu::item:selected {
+ border-style: solid;
+ border-top-color: transparent;
+ border-right-color: transparent;
+ border-left-color: #e67e22;
+ border-bottom-color: transparent;
+ border-left-width: 2px;
+ color: #FFFFFF;
+ padding-left:15px;
+ padding-top:4px;
+ padding-bottom:4px;
+ padding-right:7px;
+ background-color:#000000;
+}
+QMenu::item {
+ border-style: solid;
+ border-top-color: transparent;
+ border-right-color: transparent;
+ border-left-color: transparent;
+ border-bottom-color: transparent;
+ border-bottom-width: 1px;
+ border-style: solid;
+ color: #a9b7c6;
+ padding-left:17px;
+ padding-top:4px;
+ padding-bottom:4px;
+ padding-right:7px;
+ background-color:#000000;
+}
+QTabWidget {
+ color:rgb(0,0,0);
+ background-color:#000000;
+}
+QTabWidget::pane {
+ border-color: rgb(77,77,77);
+ background-color:#000000;
+ border-style: solid;
+ border-width: 1px;
+ border-radius: 6px;
+}
+QTabBar::tab {
+ border-style: solid;
+ border-top-color: transparent;
+ border-right-color: transparent;
+ border-left-color: transparent;
+ border-bottom-color: transparent;
+ border-bottom-width: 1px;
+ border-style: solid;
+ color: #808086;
+ padding: 3px;
+ margin-left:3px;
+ background-color:#000000;
+}
+QTabBar::tab:selected, QTabBar::tab:last:selected, QTabBar::tab:hover {
+ border-style: solid;
+ border-top-color: transparent;
+ border-right-color: transparent;
+ border-left-color: transparent;
+ border-bottom-color: #e67e22;
+ border-bottom-width: 2px;
+ border-style: solid;
+ color: #FFFFFF;
+ padding-left: 3px;
+ padding-bottom: 2px;
+ margin-left:3px;
+ background-color:#000000;
+}
+
+QCheckBox {
+ color: #a9b7c6;
+ padding: 2px;
+}
+QCheckBox:disabled {
+ color: #808086;
+ padding: 2px;
+}
+
+QCheckBox:hover {
+ border-radius:4px;
+ border-style:solid;
+ padding-left: 1px;
+ padding-right: 1px;
+ padding-bottom: 1px;
+ padding-top: 1px;
+ border-width:1px;
+ border-color: rgb(87, 97, 106);
+ background-color:#000000;
+}
+QCheckBox::indicator:checked {
+
+ height: 10px;
+ width: 10px;
+ border-style:solid;
+ border-width: 1px;
+ border-color: #e67e22;
+ color: #a9b7c6;
+ background-color: #e67e22;
+}
+QCheckBox::indicator:unchecked {
+
+ height: 10px;
+ width: 10px;
+ border-style:solid;
+ border-width: 1px;
+ border-color: #e67e22;
+ color: #a9b7c6;
+ background-color: transparent;
+}
+QRadioButton {
+ color: #a9b7c6;
+ background-color:#000000;
+ padding: 1px;
+}
+QRadioButton::indicator:checked {
+ height: 10px;
+ width: 10px;
+ border-style:solid;
+ border-radius:5px;
+ border-width: 1px;
+ border-color: #e67e22;
+ color: #a9b7c6;
+ background-color: #e67e22;
+}
+QRadioButton::indicator:!checked {
+ height: 10px;
+ width: 10px;
+ border-style:solid;
+ border-radius:5px;
+ border-width: 1px;
+ border-color: #e67e22;
+ color: #a9b7c6;
+ background-color: transparent;
+}
+QStatusBar {
+ color:#34e8eb;
+}
+QSpinBox {
+ color: #a9b7c6;
+ background-color:#000000;
+}
+QDoubleSpinBox {
+ color: #a9b7c6;
+ background-color:#000000;
+}
+QTimeEdit {
+ color: #a9b7c6;
+ background-color:#000000;
+}
+QDateTimeEdit {
+ color: #a9b7c6;
+ background-color:#000000;
+}
+QDateEdit {
+ color: #a9b7c6;
+ background-color:#000000;
+}
+QComboBox {
+ color: #a9b7c6;
+ background: #1e1d23;
+}
+QComboBox:editable {
+ background: #1e1d23;
+ color: #a9b7c6;
+ selection-background-color:#000000;
+}
+QComboBox QAbstractItemView {
+ color: #a9b7c6;
+ background: #1e1d23;
+ selection-color: #FFFFFF;
+ selection-background-color:#000000;
+}
+QComboBox:!editable:on, QComboBox::drop-down:editable:on {
+ color: #a9b7c6;
+ background: #1e1d23;
+}
+QFontComboBox {
+ color: #a9b7c6;
+ background-color:#000000;
+}
+QToolBox {
+ color: #a9b7c6;
+ background-color:#000000;
+}
+QToolBox::tab {
+ color: #a9b7c6;
+ background-color:#000000;
+}
+QToolBox::tab:selected {
+ color: #FFFFFF;
+ background-color:#000000;
+}
+QScrollArea {
+ color: #FFFFFF;
+ background-color:#000000;
+}
+QSlider::groove:horizontal {
+ height: 5px;
+ background: #e67e22;
+}
+QSlider::groove:vertical {
+ width: 5px;
+ background: #e67e22;
+}
+QSlider::handle:horizontal {
+ background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #b4b4b4, stop:1 #8f8f8f);
+ border: 1px solid #5c5c5c;
+ width: 14px;
+ margin: -5px 0;
+ border-radius: 7px;
+}
+QSlider::handle:vertical {
+ background: qlineargradient(x1:1, y1:1, x2:0, y2:0, stop:0 #b4b4b4, stop:1 #8f8f8f);
+ border: 1px solid #5c5c5c;
+ height: 14px;
+ margin: 0 -5px;
+ border-radius: 7px;
+}
+QSlider::add-page:horizontal {
+ background: white;
+}
+QSlider::add-page:vertical {
+ background: white;
+}
+QSlider::sub-page:horizontal {
+ background: #e67e22;
+}
+QSlider::sub-page:vertical {
+ background: #e67e22;
+}
+QScrollBar:horizontal {
+ max-height: 20px;
+ background: rgb(0,0,0);
+ border: 1px transparent grey;
+ margin: 0px 20px 0px 20px;
+}
+QScrollBar::handle:horizontal {
+ background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 rgba(255, 0, 0, 0), stop:0.7 rgba(255, 0, 0, 0), stop:0.71 rgb(230, 126, 34), stop:1 rgb(230, 126, 34));
+ border-style: solid;
+ border-width: 1px;
+ border-color: rgb(0,0,0);
+ min-width: 25px;
+}
+QScrollBar::handle:horizontal:hover {
+ background: rgb(230, 126, 34);
+ border-style: solid;
+ border-width: 1px;
+ border-color: rgb(0,0,0);
+ min-width: 25px;
+}
+QScrollBar::add-line:horizontal {
+ border: 1px solid;
+ border-color: rgb(0,0,0);
+ background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 rgba(255, 0, 0, 0), stop:0.7 rgba(255, 0, 0, 0), stop:0.71 rgb(230, 126, 34), stop:1 rgb(230, 126, 34));
+ width: 20px;
+ subcontrol-position: right;
+ subcontrol-origin: margin;
+}
+QScrollBar::add-line:horizontal:hover {
+ border: 1px solid;
+ border-color: rgb(0,0,0);
+ border-radius: 8px;
+ background: rgb(230, 126, 34);
+ height: 16px;
+ width: 16px;
+ subcontrol-position: right;
+ subcontrol-origin: margin;
+}
+QScrollBar::add-line:horizontal:pressed {
+ border: 1px solid;
+ border-color: grey;
+ border-radius: 8px;
+ background: rgb(230, 126, 34);
+ height: 16px;
+ width: 16px;
+ subcontrol-position: right;
+ subcontrol-origin: margin;
+}
+QScrollBar::sub-line:horizontal {
+ border: 1px solid;
+ border-color: rgb(0,0,0);
+ background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 rgba(255, 0, 0, 0), stop:0.7 rgba(255, 0, 0, 0), stop:0.71 rgb(230, 126, 34), stop:1 rgb(230, 126, 34));
+ width: 20px;
+ subcontrol-position: left;
+ subcontrol-origin: margin;
+}
+QScrollBar::sub-line:horizontal:hover {
+ border: 1px solid;
+ border-color: rgb(0,0,0);
+ border-radius: 8px;
+ background: rgb(230, 126, 34);
+ height: 16px;
+ width: 16px;
+ subcontrol-position: left;
+ subcontrol-origin: margin;
+}
+QScrollBar::sub-line:horizontal:pressed {
+ border: 1px solid;
+ border-color: grey;
+ border-radius: 8px;
+ background: rgb(230, 126, 34);
+ height: 16px;
+ width: 16px;
+ subcontrol-position: left;
+ subcontrol-origin: margin;
+}
+QScrollBar::left-arrow:horizontal {
+ border: 1px transparent grey;
+ border-radius: 3px;
+ width: 6px;
+ height: 6px;
+ background: rgb(0,0,0);
+}
+QScrollBar::right-arrow:horizontal {
+ border: 1px transparent grey;
+ border-radius: 3px;
+ width: 6px;
+ height: 6px;
+ background: rgb(0,0,0);
+}
+QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal {
+ background: none;
+}
+QScrollBar:vertical {
+ max-width: 20px;
+ background: rgb(0,0,0);
+ border: 1px transparent grey;
+ margin: 20px 0px 20px 0px;
+}
+QScrollBar::add-line:vertical {
+ border: 1px solid;
+ border-color: rgb(0,0,0);
+ background-color: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 rgba(255, 0, 0, 0), stop:0.7 rgba(255, 0, 0, 0), stop:0.71 rgb(230, 126, 34), stop:1 rgb(230, 126, 34));
+ height: 20px;
+ subcontrol-position: bottom;
+ subcontrol-origin: margin;
+}
+QScrollBar::add-line:vertical:hover {
+ border: 1px solid;
+ border-color: rgb(0,0,0);
+ border-radius: 8px;
+ background: rgb(230, 126, 34);
+ height: 16px;
+ width: 16px;
+ subcontrol-position: bottom;
+ subcontrol-origin: margin;
+}
+QScrollBar::add-line:vertical:pressed {
+ border: 1px solid;
+ border-color: grey;
+ border-radius: 8px;
+ background: rgb(230, 126, 34);
+ height: 16px;
+ width: 16px;
+ subcontrol-position: bottom;
+ subcontrol-origin: margin;
+}
+QScrollBar::sub-line:vertical {
+ border: 1px solid;
+ border-color: rgb(0,0,0);
+ background-color: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 rgba(255, 0, 0, 0), stop:0.7 rgba(255, 0, 0, 0), stop:0.71 rgb(230, 126, 34), stop:1 rgb(230, 126, 34));
+ height: 20px;
+ subcontrol-position: top;
+ subcontrol-origin: margin;
+}
+QScrollBar::sub-line:vertical:hover {
+ border: 1px solid;
+ border-color: rgb(0,0,0);
+ border-radius: 8px;
+ background: rgb(230, 126, 34);
+ height: 16px;
+ width: 16px;
+ subcontrol-position: top;
+ subcontrol-origin: margin;
+}
+QScrollBar::sub-line:vertical:pressed {
+ border: 1px solid;
+ border-color: grey;
+ border-radius: 8px;
+ background: rgb(230, 126, 34);
+ height: 16px;
+ width: 16px;
+ subcontrol-position: top;
+ subcontrol-origin: margin;
+}
+ QScrollBar::handle:vertical {
+ background-color: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 rgba(255, 0, 0, 0), stop:0.7 rgba(255, 0, 0, 0), stop:0.71 rgb(230, 126, 34), stop:1 rgb(230, 126, 34));
+ border-style: solid;
+ border-width: 1px;
+ border-color: rgb(0,0,0);
+ min-height: 25px;
+}
+QScrollBar::handle:vertical:hover {
+ background: rgb(230, 126, 34);
+ border-style: solid;
+ border-width: 1px;
+ border-color: rgb(0,0,0);
+ min-heigth: 25px;
+}
+QScrollBar::up-arrow:vertical {
+ border: 1px transparent grey;
+ border-radius: 3px;
+ width: 6px;
+ height: 6px;
+ background: rgb(0,0,0);
+}
+QScrollBar::down-arrow:vertical {
+ border: 1px transparent grey;
+ border-radius: 3px;
+ width: 6px;
+ height: 6px;
+ background: rgb(0,0,0);
+}
+QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {
+ background: none;
+}
diff --git a/freemocap/gui/qt/style_sheet/ElegantDark.qss b/freemocap/gui/qt/style_sheet/ElegantDark.qss
new file mode 100644
index 00000000..0b0012b2
--- /dev/null
+++ b/freemocap/gui/qt/style_sheet/ElegantDark.qss
@@ -0,0 +1,196 @@
+/*
+ElegantDark Style Sheet for QT Applications
+Author: Jaime A. Quiroga P.
+Company: GTRONICK
+Last updated: 17/04/2018
+Available at: https://github.com/GTRONICK/QSS/blob/master/ElegantDark.qss
+*/
+QMainWindow {
+ background-color:rgb(82, 82, 82);
+}
+QTextEdit {
+ background-color:rgb(42, 42, 42);
+ color: rgb(0, 255, 0);
+}
+QPushButton{
+ border-style: outset;
+ border-width: 2px;
+ border-top-color: qlineargradient(spread:pad, x1:0.5, y1:0.6, x2:0.5, y2:0.4, stop:0 rgba(115, 115, 115, 255), stop:1 rgba(62, 62, 62, 255));
+ border-right-color: qlineargradient(spread:pad, x1:0.4, y1:0.5, x2:0.6, y2:0.5, stop:0 rgba(115, 115, 115, 255), stop:1 rgba(62, 62, 62, 255));
+ border-left-color: qlineargradient(spread:pad, x1:0.6, y1:0.5, x2:0.4, y2:0.5, stop:0 rgba(115, 115, 115, 255), stop:1 rgba(62, 62, 62, 255));
+ border-bottom-color: rgb(58, 58, 58);
+ border-bottom-width: 1px;
+ border-style: solid;
+ color: rgb(255, 255, 255);
+ padding: 2px;
+ background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(77, 77, 77, 255), stop:1 rgba(97, 97, 97, 255));
+}
+QPushButton:hover{
+ border-style: outset;
+ border-width: 2px;
+ border-top-color: qlineargradient(spread:pad, x1:0.5, y1:0.6, x2:0.5, y2:0.4, stop:0 rgba(180, 180, 180, 255), stop:1 rgba(110, 110, 110, 255));
+ border-right-color: qlineargradient(spread:pad, x1:0.4, y1:0.5, x2:0.6, y2:0.5, stop:0 rgba(180, 180, 180, 255), stop:1 rgba(110, 110, 110, 255));
+ border-left-color: qlineargradient(spread:pad, x1:0.6, y1:0.5, x2:0.4, y2:0.5, stop:0 rgba(180, 180, 180, 255), stop:1 rgba(110, 110, 110, 255));
+ border-bottom-color: rgb(115, 115, 115);
+ border-bottom-width: 1px;
+ border-style: solid;
+ color: rgb(255, 255, 255);
+ padding: 2px;
+ background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(107, 107, 107, 255), stop:1 rgba(157, 157, 157, 255));
+}
+QPushButton:pressed{
+ border-style: outset;
+ border-width: 2px;
+ border-top-color: qlineargradient(spread:pad, x1:0.5, y1:0.6, x2:0.5, y2:0.4, stop:0 rgba(62, 62, 62, 255), stop:1 rgba(22, 22, 22, 255));
+ border-right-color: qlineargradient(spread:pad, x1:0.4, y1:0.5, x2:0.6, y2:0.5, stop:0 rgba(115, 115, 115, 255), stop:1 rgba(62, 62, 62, 255));
+ border-left-color: qlineargradient(spread:pad, x1:0.6, y1:0.5, x2:0.4, y2:0.5, stop:0 rgba(115, 115, 115, 255), stop:1 rgba(62, 62, 62, 255));
+ border-bottom-color: rgb(58, 58, 58);
+ border-bottom-width: 1px;
+ border-style: solid;
+ color: rgb(255, 255, 255);
+ padding: 2px;
+ background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(77, 77, 77, 255), stop:1 rgba(97, 97, 97, 255));
+}
+QPushButton:disabled{
+ border-style: outset;
+ border-width: 2px;
+ border-top-color: qlineargradient(spread:pad, x1:0.5, y1:0.6, x2:0.5, y2:0.4, stop:0 rgba(115, 115, 115, 255), stop:1 rgba(62, 62, 62, 255));
+ border-right-color: qlineargradient(spread:pad, x1:0.4, y1:0.5, x2:0.6, y2:0.5, stop:0 rgba(115, 115, 115, 255), stop:1 rgba(62, 62, 62, 255));
+ border-left-color: qlineargradient(spread:pad, x1:0.6, y1:0.5, x2:0.4, y2:0.5, stop:0 rgba(115, 115, 115, 255), stop:1 rgba(62, 62, 62, 255));
+ border-bottom-color: rgb(58, 58, 58);
+ border-bottom-width: 1px;
+ border-style: solid;
+ color: rgb(0, 0, 0);
+ padding: 2px;
+ background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(57, 57, 57, 255), stop:1 rgba(77, 77, 77, 255));
+}
+QLineEdit {
+ border-width: 1px; border-radius: 4px;
+ border-color: rgb(58, 58, 58);
+ border-style: inset;
+ padding: 0 8px;
+ color: rgb(255, 255, 255);
+ background:rgb(100, 100, 100);
+ selection-background-color: rgb(187, 187, 187);
+ selection-color: rgb(60, 63, 65);
+}
+QLabel {
+ color:rgb(255,255,255);
+}
+QProgressBar {
+ text-align: center;
+ color: rgb(240, 240, 240);
+ border-width: 1px;
+ border-radius: 10px;
+ border-color: rgb(58, 58, 58);
+ border-style: inset;
+ background-color:rgb(77,77,77);
+}
+QProgressBar::chunk {
+ background-color: qlineargradient(spread:pad, x1:0.5, y1:0.7, x2:0.5, y2:0.3, stop:0 rgba(87, 97, 106, 255), stop:1 rgba(93, 103, 113, 255));
+ border-radius: 5px;
+}
+QMenuBar {
+ background:rgb(82, 82, 82);
+}
+QMenuBar::item {
+ color:rgb(223,219,210);
+ spacing: 3px;
+ padding: 1px 4px;
+ background: transparent;
+}
+
+QMenuBar::item:selected {
+ background:rgb(115, 115, 115);
+}
+QMenu::item:selected {
+ color:rgb(255,255,255);
+ border-width:2px;
+ border-style:solid;
+ padding-left:18px;
+ padding-right:8px;
+ padding-top:2px;
+ padding-bottom:3px;
+ background:qlineargradient(spread:pad, x1:0.5, y1:0.7, x2:0.5, y2:0.3, stop:0 rgba(87, 97, 106, 255), stop:1 rgba(93, 103, 113, 255));
+ border-top-color: qlineargradient(spread:pad, x1:0.5, y1:0.6, x2:0.5, y2:0.4, stop:0 rgba(115, 115, 115, 255), stop:1 rgba(62, 62, 62, 255));
+ border-right-color: qlineargradient(spread:pad, x1:0.4, y1:0.5, x2:0.6, y2:0.5, stop:0 rgba(115, 115, 115, 255), stop:1 rgba(62, 62, 62, 255));
+ border-left-color: qlineargradient(spread:pad, x1:0.6, y1:0.5, x2:0.4, y2:0.5, stop:0 rgba(115, 115, 115, 255), stop:1 rgba(62, 62, 62, 255));
+ border-bottom-color: rgb(58, 58, 58);
+ border-bottom-width: 1px;
+}
+QMenu::item {
+ color:rgb(223,219,210);
+ background-color:rgb(78,78,78);
+ padding-left:20px;
+ padding-top:4px;
+ padding-bottom:4px;
+ padding-right:10px;
+}
+QMenu{
+ background-color:rgb(78,78,78);
+}
+QTabWidget {
+ color:rgb(0,0,0);
+ background-color:rgb(247,246,246);
+}
+QTabWidget::pane {
+ border-color: rgb(77,77,77);
+ background-color:rgb(101,101,101);
+ border-style: solid;
+ border-width: 1px;
+ border-radius: 6px;
+}
+QTabBar::tab {
+ padding:2px;
+ color:rgb(250,250,250);
+ background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(77, 77, 77, 255), stop:1 rgba(97, 97, 97, 255));
+ border-style: solid;
+ border-width: 2px;
+ border-top-right-radius:4px;
+ border-top-left-radius:4px;
+ border-top-color: qlineargradient(spread:pad, x1:0.5, y1:0.6, x2:0.5, y2:0.4, stop:0 rgba(115, 115, 115, 255), stop:1 rgba(95, 92, 93, 255));
+ border-right-color: qlineargradient(spread:pad, x1:0.4, y1:0.5, x2:0.6, y2:0.5, stop:0 rgba(115, 115, 115, 255), stop:1 rgba(95, 92, 93, 255));
+ border-left-color: qlineargradient(spread:pad, x1:0.6, y1:0.5, x2:0.4, y2:0.5, stop:0 rgba(115, 115, 115, 255), stop:1 rgba(95, 92, 93, 255));
+ border-bottom-color: rgb(101,101,101);
+}
+QTabBar::tab:selected, QTabBar::tab:last:selected, QTabBar::tab:hover {
+ background-color:rgb(101,101,101);
+ margin-left: 0px;
+ margin-right: 1px;
+}
+QTabBar::tab:!selected {
+ margin-top: 1px;
+ margin-right: 1px;
+}
+QCheckBox {
+ color:rgb(223,219,210);
+ padding: 2px;
+}
+QCheckBox:hover {
+ border-radius:4px;
+ border-style:solid;
+ padding-left: 1px;
+ padding-right: 1px;
+ padding-bottom: 1px;
+ padding-top: 1px;
+ border-width:1px;
+ border-color: rgb(87, 97, 106);
+ background-color:qlineargradient(spread:pad, x1:0.5, y1:0.7, x2:0.5, y2:0.3, stop:0 rgba(87, 97, 106, 150), stop:1 rgba(93, 103, 113, 150));
+}
+QCheckBox::indicator:checked {
+ border-radius:4px;
+ border-style:solid;
+ border-width:1px;
+ border-color: rgb(180,180,180);
+ background-color:qlineargradient(spread:pad, x1:0.5, y1:0.7, x2:0.5, y2:0.3, stop:0 rgba(87, 97, 106, 255), stop:1 rgba(93, 103, 113, 255));
+}
+QCheckBox::indicator:unchecked {
+ border-radius:4px;
+ border-style:solid;
+ border-width:1px;
+ border-color: rgb(87, 97, 106);
+ background-color:rgb(255,255,255);
+}
+QStatusBar {
+ color:rgb(240,240,240);
+}
diff --git a/freemocap/gui/qt/style_sheet/FunkyTown.qss b/freemocap/gui/qt/style_sheet/FunkyTown.qss
new file mode 100644
index 00000000..1f62052a
--- /dev/null
+++ b/freemocap/gui/qt/style_sheet/FunkyTown.qss
@@ -0,0 +1,196 @@
+/*
+ElegantDark Style Sheet for QT Applications
+Author: Jaime A. Quiroga P.
+Company: GTRONICK
+Last updated: 17/04/2018
+Available at: https://github.com/GTRONICK/QSS/blob/master/ElegantDark.qss
+*/
+QMainWindow {
+ background-color:rgb(182, 82, 82);
+}
+QTextEdit {
+ background-color:rgb(42, 42, 42);
+ color: rgb(0, 255, 0);
+}
+QPushButton{
+ border-style: outset;
+ border-width: 2px;
+ border-top-color: qlineargradient(spread:pad, x1:0.5, y1:0.6, x2:0.5, y2:0.4, stop:0 rgba(15, 215, 115, 255), stop:1 rgba(162, 62, 212, 255));
+ border-right-color: qlineargradient(spread:pad, x1:0.4, y1:0.5, x2:0.6, y2:0.5, stop:0 rgba(15, 215, 115, 255), stop:1 rgba(162, 62, 212, 255));
+ border-left-color: qlineargradient(spread:pad, x1:0.6, y1:0.5, x2:0.4, y2:0.5, stop:0 rgba(15, 215, 115, 255), stop:1 rgba(162, 62, 212, 255));
+ border-bottom-color: rgb(58, 58, 58);
+ border-bottom-width: 1px;
+ border-style: solid;
+ color: rgb(255, 255, 255);
+ padding: 2px;
+ background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:.5, y2:0, stop:0 rgba(1, 247, 77, 255), stop:1 rgba(232, 7, 247, 255));
+}
+QPushButton:hover{
+ border-style: outset;
+ border-width: 2px;
+ border-top-color: qlineargradient(spread:pad, x1:0.5, y1:0.6, x2:0.5, y2:0.4, stop:0 rgba(180, 10, 180, 255), stop:1 rgba(110, 110, 110, 255));
+ border-right-color: qlineargradient(spread:pad, x1:0.4, y1:0.5, x2:0.6, y2:0.5, stop:0 rgba(180, 10, 180, 255), stop:1 rgba(110, 110, 110, 255));
+ border-left-color: qlineargradient(spread:pad, x1:0.6, y1:0.5, x2:0.4, y2:0.5, stop:0 rgba(180, 10, 180, 255), stop:1 rgba(110, 110, 110, 255));
+ border-bottom-color: rgb(115, 115, 115);
+ border-bottom-width: 1px;
+ border-style: solid;
+ color: rgb(255, 255, 255);
+ padding: 2px;
+ background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(107, 107, 107, 255), stop:1 rgba(157, 157, 157, 255));
+}
+QPushButton:pressed{
+ border-style: outset;
+ border-width: 2px;
+ border-top-color: qlineargradient(spread:pad, x1:0.5, y1:0.6, x2:0.5, y2:0.4, stop:0 rgba(162, 62, 212, 255), stop:1 rgba(22, 22, 22, 255));
+ border-right-color: qlineargradient(spread:pad, x1:0.4, y1:0.5, x2:0.6, y2:0.5, stop:0 rgba(15, 215, 115, 255), stop:1 rgba(162, 62, 212, 255));
+ border-left-color: qlineargradient(spread:pad, x1:0.6, y1:0.5, x2:0.4, y2:0.5, stop:0 rgba(15, 215, 115, 255), stop:1 rgba(162, 62, 212, 255));
+ border-bottom-color: rgb(58, 58, 58);
+ border-bottom-width: 1px;
+ border-style: solid;
+ color: rgb(255, 255, 255);
+ padding: 2px;
+ background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(77, 77, 77, 255), stop:1 rgba(97, 97, 97, 255));
+}
+QPushButton:disabled{
+ border-style: outset;
+ border-width: 2px;
+ border-top-color: qlineargradient(spread:pad, x1:0.5, y1:0.6, x2:0.5, y2:0.4, stop:0 rgba(15, 215, 115, 255), stop:1 rgba(162, 62, 212, 255));
+ border-right-color: qlineargradient(spread:pad, x1:0.4, y1:0.5, x2:0.6, y2:0.5, stop:0 rgba(15, 215, 115, 255), stop:1 rgba(162, 62, 212, 255));
+ border-left-color: qlineargradient(spread:pad, x1:0.6, y1:0.5, x2:0.4, y2:0.5, stop:0 rgba(15, 215, 115, 255), stop:1 rgba(162, 62, 212, 255));
+ border-bottom-color: rgb(58, 58, 58);
+ border-bottom-width: 1px;
+ border-style: solid;
+ color: rgb(0, 0, 0);
+ padding: 2px;
+ background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(57, 57, 57, 255), stop:1 rgba(77, 77, 77, 255));
+}
+QLineEdit {
+ border-width: 1px; border-radius: 4px;
+ border-color: rgb(58, 58, 58);
+ border-style: inset;
+ padding: 0 8px;
+ color: rgb(255, 255, 255);
+ background:rgb(100, 100, 100);
+ selection-background-color: rgb(187, 187, 187);
+ selection-color: rgb(60, 63, 65);
+}
+QLabel {
+ color:rgb(255,255,255);
+}
+QProgressBar {
+ text-align: center;
+ color: rgb(240, 240, 240);
+ border-width: 1px;
+ border-radius: 10px;
+ border-color: rgb(58, 58, 58);
+ border-style: inset;
+ background-color:rgb(77,77,77);
+}
+QProgressBar::chunk {
+ background-color: qlineargradient(spread:pad, x1:0.5, y1:0.7, x2:0.5, y2:0.3, stop:0 #ffff00, stop:1 rgba(93, 103, 113, 255));
+ border-radius: 5px;
+}
+QMenuBar {
+ background:rgb(82, 82, 82);
+}
+QMenuBar::item {
+ color:rgb(223,219,210);
+ spacing: 3px;
+ padding: 1px 4px;
+ background: transparent;
+}
+
+QMenuBar::item:selected {
+ background:rgb(115, 115, 115);
+}
+QMenu::item:selected {
+ color:rgb(255,255,255);
+ border-width:2px;
+ border-style:solid;
+ padding-left:18px;
+ padding-right:8px;
+ padding-top:2px;
+ padding-bottom:3px;
+ background:qlineargradient(spread:pad, x1:0.5, y1:0.7, x2:0.5, y2:0.3, stop:0 #ffff00, stop:1 rgba(255, 03, 213, 255));
+ border-top-color: qlineargradient(spread:pad, x1:0.5, y1:0.6, x2:0.5, y2:0.4, stop:0 rgba(15, 215, 115, 255), stop:1 rgba(162, 62, 212, 255));
+ border-right-color: qlineargradient(spread:pad, x1:0.4, y1:0.5, x2:0.6, y2:0.5, stop:0 rgba(15, 215, 115, 255), stop:1 rgba(162, 62, 212, 255));
+ border-left-color: qlineargradient(spread:pad, x1:0.6, y1:0.5, x2:0.4, y2:0.5, stop:0 rgba(15, 215, 115, 255), stop:1 rgba(162, 62, 212, 255));
+ border-bottom-color: rgb(58, 58, 58);
+ border-bottom-width: 1px;
+}
+QMenu::item {
+ color:rgb(223,219,210);
+ background-color:rgb(78,78,78);
+ padding-left:20px;
+ padding-top:4px;
+ padding-bottom:4px;
+ padding-right:10px;
+}
+QMenu{
+ background-color:rgb(78,78,78);
+}
+QTabWidget {
+ color:rgb(0,0,0);
+ background-color:rgb(247,246,246);
+}
+QTabWidget::pane {
+ border-color: rgb(77,177,77);
+ background-color:qlineargradient(spread:pad, x1:0.5, y1:0.7, x2:0.5, y2:0.3, stop:0 rgba(237, 7, 06, 150), stop:1 rgba(3, 03, 213, 150));
+ border-style: solid;
+ border-width: 1px;
+ border-radius: 6px;
+}
+QTabBar::tab {
+ padding:2px;
+ color:rgb(250,250,250);
+ background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(77, 77, 77, 255), stop:1 rgba(97, 97, 97, 255));
+ border-style: solid;
+ border-width: 2px;
+ border-top-right-radius:4px;
+ border-top-left-radius:4px;
+ border-top-color: qlineargradient(spread:pad, x1:0.5, y1:0.6, x2:0.5, y2:0.4, stop:0 rgba(15, 215, 115, 255), stop:1 rgba(95, 92, 93, 255));
+ border-right-color: qlineargradient(spread:pad, x1:0.4, y1:0.5, x2:0.6, y2:0.5, stop:0 rgba(15, 215, 115, 255), stop:1 rgba(95, 92, 93, 255));
+ border-left-color: qlineargradient(spread:pad, x1:0.6, y1:0.5, x2:0.4, y2:0.5, stop:0 rgba(15, 215, 115, 255), stop:1 rgba(95, 92, 93, 255));
+ border-bottom-color: rgb(101,101,101);
+}
+QTabBar::tab:selected, QTabBar::tab:last:selected, QTabBar::tab:hover {
+ background-color:rgb(101,101,101);
+ margin-left: 0px;
+ margin-right: 1px;
+}
+QTabBar::tab:!selected {
+ margin-top: 1px;
+ margin-right: 1px;
+}
+QCheckBox {
+ color:rgb(223,219,210);
+ padding: 2px;
+}
+QCheckBox:hover {
+ border-radius:4px;
+ border-style:solid;
+ padding-left: 1px;
+ padding-right: 1px;
+ padding-bottom: 1px;
+ padding-top: 1px;
+ border-width:1px;
+ border-color: rgb(87, 97, 106);
+ background-color:qlineargradient(spread:pad, x1:0.5, y1:0.7, x2:0.5, y2:0.3, stop:0 rgba(87, 97, 106, 150), stop:1 rgba(93, 103, 113, 150));
+}
+QCheckBox::indicator:checked {
+ border-radius:4px;
+ border-style:solid;
+ border-width:1px;
+ border-color: rgb(180,180,180);
+ background-color:qlineargradient(spread:pad, x1:0.5, y1:0.7, x2:0.5, y2:0.3, stop:0 #bf07ea, stop:1 rgba(93, 103, 113, 255));
+}
+QCheckBox::indicator:unchecked {
+ border-radius:4px;
+ border-style:solid;
+ border-width:1px;
+ border-color: rgb(87, 97, 106);
+ background-color:rgb(255,255,255);
+}
+QStatusBar {
+ color:rgb(240,240,240);
+}
diff --git a/src/core_processes/__init__.py b/freemocap/gui/qt/style_sheet/__init__.py
similarity index 100%
rename from src/core_processes/__init__.py
rename to freemocap/gui/qt/style_sheet/__init__.py
diff --git a/freemocap/gui/qt/style_sheet/css_file_watcher.py b/freemocap/gui/qt/style_sheet/css_file_watcher.py
new file mode 100644
index 00000000..a3279cb2
--- /dev/null
+++ b/freemocap/gui/qt/style_sheet/css_file_watcher.py
@@ -0,0 +1,38 @@
+import logging
+from pathlib import Path
+from typing import Union
+
+from PyQt6 import QtCore
+from PyQt6.QtCore import pyqtSlot, QFileSystemWatcher
+
+logger = logging.getLogger(__name__)
+
+
+class CSSFileWatcher(QFileSystemWatcher):
+ def __init__(self, path_to_css_file: Union[str, Path], parent=None):
+ super().__init__(parent)
+ self.addPath(str(path_to_css_file))
+ self.parent = parent
+ self.fileChanged.connect(self.file_changed)
+
+ @pyqtSlot(str)
+ def file_changed(self, path: str):
+ logger.info(f"CSS file changed: {path} - updating MainWindow stylesheet")
+
+ try:
+ with open(path, "r") as css_file:
+ logger.info(f"Reading CSS file from: {path}")
+ css_string = css_file.read()
+ logger.info(f"Setting stylesheet for {self.parent}")
+ self.parent.setStyleSheet(css_string)
+ except Exception as e:
+ logger.error(f"Error setting stylesheet: {e}")
+
+
+if __name__ == "__main__":
+ app = QtCore.QCoreApplication([])
+ qt_file_system_watcher = CSSFileWatcher(path_to_css_file=Path(__file__).parent / "qt_style_sheet.css")
+ print(f"watching directories - {qt_file_system_watcher.directories()})")
+ print(f"watching files - {qt_file_system_watcher.files()})")
+ app.exec()
+ print("done!")
diff --git a/freemocap/gui/qt/style_sheet/qt_style_sheet.css b/freemocap/gui/qt/style_sheet/qt_style_sheet.css
new file mode 100644
index 00000000..84c58237
--- /dev/null
+++ b/freemocap/gui/qt/style_sheet/qt_style_sheet.css
@@ -0,0 +1,217 @@
+* {
+ font-family: "Dosis", sans-serif;
+ /*font-size: 12px;*/
+ color: #333333;
+}
+
+QGroupBox {
+ border: 1px solid #1c6266;
+ border-radius: 4px;
+ margin-top: 10px;
+ font-weight: bold;
+}
+QGroupBox[calibration_videos_radio_button_checked=false] {
+ background-color: #06bbda;
+}
+QGroupBox[calibration_videos_radio_button_checked=true] {
+ background-color: #9f795e;
+}
+
+QStatusBar {
+ color: #334411;
+}
+
+QMainWindow {
+ background-color: #2b9ba1;
+}
+
+QTabWidget::pane {
+ border: 1px solid lightgray;
+ top: 1px;
+ background: cadetblue ;
+}
+
+QTabBar::tab {
+ background: lightseagreen;
+ border: 1px solid #2b9692;
+ padding: 5px;
+ color: #235957;
+ border-top-left-radius: 20px;
+ border-top-right-radius: 5px;
+ /*min-width: 200px;*/
+}
+
+QTabBar::tab {
+ background: seashell;
+ margin-bottom: -5px;
+ font-weight: bolder;
+ font-size: 14px;
+}
+
+QDockWidget:disabled {
+ background-color: #2b9692;
+ color: #1ec2c2;
+}
+
+
+QTabBar::tab [control_panel_tabs=true] {
+
+ background: #2a595f;
+ border: 2px solid #7906e5;
+ padding: 1px;
+ border-bottom-right-radius: 20px;
+ border-top-right-radius: 5px;
+ margin-right: 90px;
+ color: #1ec2c2;
+}
+
+
+QTabBar[control_panel_tabs=true]::tab:selected {
+ background: #4b1d7e;
+ border-bottom-right-radius: 20px;
+ border-top-right-radius: 5px;
+ margin-right: 70px;
+ color: mintcream;
+}
+
+
+
+QPushButton {
+ /*font-size: 24px;*/
+
+ font-weight: bold;
+ border-radius: 4px;
+ border: 2px solid #29394a;
+ background-color: #29394a;
+ color: #dddddd;
+}
+
+QPushButton:focus {
+ border: 3px solid #ff0893;
+}
+
+QPushButton:disabled {
+ border: 2px solid #a0a2af;
+ background-color: #a0a2af;
+ color: #2d736f;
+}
+
+QPushButton:hover {
+ border: 3px solid #ff40aa;
+}
+QPushButton#start_recording_button {
+ font-size: 18px;
+ background-color: #8f0404;
+}
+QPushButton#start_recording_button:disabled {
+ background-color: #8c5454;
+}
+
+QPushButton#stop_recording_button {
+ font-size: 18px;
+
+}
+QPushButton#stop_recording_button:enabled {
+ /*font-size: 24px;*/
+ border: 3px solid #ff4046;
+}
+
+
+WelcomeScreenButton {
+ border: 2px solid #29394a;
+ background-color: #213496;
+ color: #dddddd;
+ font-size: 24px;
+ border-radius: 20px;
+ padding: 10px;
+
+
+}
+
+
+
+
+WelcomeScreenButton[secondary_button = true] {
+
+ background-color: #12194b;
+ color: #cccccc;
+ font-size: 20px;
+
+}
+
+
+WelcomeScreenButton[recommended_next = true] {
+ background-color: #7b20b7;
+ color: #ffffff;
+}
+
+
+
+
+QLabel {
+
+ /*font-family: "Roboto", sans-serif;*/
+ /*font-weight: bold;*/
+ font-size: 14px;
+ color: #333333;
+}
+
+
+
+QLabel:disabled {
+ color: #33594d;
+}
+
+QLineEdit {
+ border: 1px solid #496482;
+ border-radius: 4px;
+ padding: 0 8px;
+ color: #222222;
+
+}
+
+QLineEdit:disabled {
+ color: #3c3d48;
+ background-color: #687e90;
+}
+
+QRadioButton:checked {
+ color: #7906e5;
+
+}
+
+QTreeView {
+ background-color: #7983b1;
+ alternate-background-color: #a3b1ed;
+ color: #222222;
+ font-weight: bold;
+ font-family: "Roboto", sans-serif;
+ font-size: 12px;
+}
+
+
+QTreeView::item:has-children {
+ background-color: '#49587d';
+ color: #ffffff;
+}
+
+QTreeView::item:selected {
+ background-color: #0932c2;
+}
+
+QTreeView::item:selected:active {
+ background-color: #6c00e0;
+}
+
+QTreeView::item:hover {
+ background-color: #378e90;
+}
+
+LogViewWidget {
+ background-color: #0b2424;
+ color: #1ed760;
+ /*font-weight: bold;*/
+ font-family: "Roboto", sans-serif;
+ font-size: 12px;
+ padding: 8px;
+}
diff --git a/freemocap/gui/qt/style_sheet/set_css_style_sheet.py b/freemocap/gui/qt/style_sheet/set_css_style_sheet.py
new file mode 100644
index 00000000..0d37f7b6
--- /dev/null
+++ b/freemocap/gui/qt/style_sheet/set_css_style_sheet.py
@@ -0,0 +1,10 @@
+from pathlib import Path
+from typing import Union
+
+from PyQt6.QtWidgets import QWidget
+
+
+def apply_css_style_sheet(qt_widget: QWidget, path_to_css_file: Union[str, Path]):
+ with open(path_to_css_file, "r") as css_file:
+ css_string = css_file.read()
+ qt_widget.setStyleSheet(css_string)
diff --git a/freemocap/gui/qt/style_sheet/stylesheet-branch-more.png b/freemocap/gui/qt/style_sheet/stylesheet-branch-more.png
new file mode 100644
index 00000000..664ad447
Binary files /dev/null and b/freemocap/gui/qt/style_sheet/stylesheet-branch-more.png differ
diff --git a/src/core_processes/batch_processing/__init__.py b/freemocap/gui/qt/utilities/__init__.py
similarity index 100%
rename from src/core_processes/batch_processing/__init__.py
rename to freemocap/gui/qt/utilities/__init__.py
diff --git a/src/gui/main/app.py b/freemocap/gui/qt/utilities/get_qt_app.py
similarity index 100%
rename from src/gui/main/app.py
rename to freemocap/gui/qt/utilities/get_qt_app.py
diff --git a/freemocap/gui/qt/utilities/update_most_recent_recording_toml.py b/freemocap/gui/qt/utilities/update_most_recent_recording_toml.py
new file mode 100644
index 00000000..902d445a
--- /dev/null
+++ b/freemocap/gui/qt/utilities/update_most_recent_recording_toml.py
@@ -0,0 +1,29 @@
+import logging
+from pathlib import Path
+from typing import Union
+
+import toml
+
+from freemocap.parameter_info_models.recording_info_model import RecordingInfoModel
+from freemocap.system.paths_and_files_names import (
+ get_most_recent_recording_toml_path,
+ SYNCHRONIZED_VIDEOS_FOLDER_NAME,
+)
+
+logger = logging.getLogger(__name__)
+
+
+def update_most_recent_recording_toml(recording_info_model: RecordingInfoModel):
+ """Save the most recent recording path to a toml file"""
+
+ output_file_path = get_most_recent_recording_toml_path()
+
+ logger.info(
+ f"Saving most recent recording path {str(recording_info_model.path)} to toml file: {str(output_file_path)}"
+ )
+ toml_dict = {}
+ toml_dict["most_recent_recording_path"] = str(recording_info_model.path)
+ toml_dict["recording_status"] = recording_info_model.status_check
+
+ with open(str(output_file_path), "w") as toml_file:
+ toml.dump(toml_dict, toml_file)
diff --git a/src/core_processes/capture_volume_calibration/__init__.py b/freemocap/gui/qt/widgets/__init__.py
similarity index 100%
rename from src/core_processes/capture_volume_calibration/__init__.py
rename to freemocap/gui/qt/widgets/__init__.py
diff --git a/freemocap/gui/qt/widgets/active_recording_widget.py b/freemocap/gui/qt/widgets/active_recording_widget.py
new file mode 100644
index 00000000..acf16f62
--- /dev/null
+++ b/freemocap/gui/qt/widgets/active_recording_widget.py
@@ -0,0 +1,184 @@
+import logging
+from pathlib import Path
+from typing import Union
+
+from PyQt6.QtCore import pyqtSignal, QFileSystemWatcher
+from PyQt6.QtWidgets import QApplication, QVBoxLayout, QWidget
+from pyqtgraph.parametertree import Parameter, ParameterTree
+
+from freemocap.parameter_info_models.recording_info_model import (
+ RecordingInfoModel,
+)
+from freemocap.system.paths_and_files_names import get_most_recent_recording_path
+
+logger = logging.getLogger(__name__)
+
+
+class ActiveRecordingInfoWidget(QWidget):
+ new_active_recording_selected_signal = pyqtSignal(RecordingInfoModel)
+
+ def __init__(
+ self,
+ parent: QWidget = None,
+ ):
+ super().__init__(parent=parent)
+ self._layout = QVBoxLayout()
+ self.setLayout(self._layout)
+
+ self._active_recording_info = None
+ self._directory_watcher = self._create_directory_watcher()
+
+ self._active_recording_view_widget = ActiveRecordingTreeView(parent=self)
+ self._active_recording_view_widget.doubleClicked.connect(self.update_parameter_tree)
+ self._layout.addWidget(self._active_recording_view_widget)
+
+ @property
+ def active_recording_info(self):
+ return self._active_recording_info
+
+ @property
+ def active_recording_view_widget(self):
+ return self._active_recording_view_widget
+
+ def get_active_recording_info(self, return_path: bool = False):
+ # this is redundant to the `active_recording_info` property,
+ # but it will be more intuitive to send this down as a callable
+ # rather than relying on 'pass-by-reference' magic lol
+
+ if self._active_recording_info is None:
+ most_recent_path = get_most_recent_recording_path()
+ if most_recent_path is not None:
+ self.set_active_recording(most_recent_path)
+
+ if return_path:
+ return self._active_recording_info.path
+
+ return self._active_recording_info
+
+ def set_active_recording(
+ self,
+ recording_folder_path: Union[str, Path],
+ ):
+ logger.info(f"Setting active recording to {recording_folder_path}")
+
+ self._active_recording_info = RecordingInfoModel(recording_folder_path=str(recording_folder_path))
+
+ self._update_file_watch_path(folder_to_watch=self._active_recording_info.path)
+
+ logger.debug(
+ f"Emitting `new_active_recording_selected_signal` for recording: {self._active_recording_info.name}"
+ )
+ self.new_active_recording_selected_signal.emit(self._active_recording_info)
+
+ def update_parameter_tree(self):
+ logger.info("Updating Parameter Tree")
+ self._active_recording_view_widget.setup_parameter_tree(self.active_recording_info)
+
+ def _update_file_watch_path(self, folder_to_watch: Union[str, Path]):
+ logger.debug(f"Updating file watch path to: {folder_to_watch}")
+
+ if self._directory_watcher.directories():
+ logger.debug(f"Removing path from watch list: {self._directory_watcher.directories()}")
+ self._directory_watcher.removePaths(self._directory_watcher.directories())
+
+ self._directory_watcher.addPath(folder_to_watch)
+
+ def _create_directory_watcher(self):
+
+ directory_watcher = QFileSystemWatcher()
+ directory_watcher.fileChanged.connect(self._handle_directory_changed)
+ directory_watcher.directoryChanged.connect(self._handle_directory_changed)
+ return directory_watcher
+
+ def _handle_directory_changed(self, path: str):
+ logger.info(f"Directory changed: {path} - Updating Parameter Tree")
+ self.update_parameter_tree()
+
+
+class ActiveRecordingTreeView(ParameterTree):
+ def __init__(self, parent=None):
+ super().__init__(parent=parent, showHeader=False)
+
+ def setup_parameter_tree(
+ self,
+ recording_info_model: RecordingInfoModel,
+ ):
+ if recording_info_model is None:
+ logger.debug("No recording info model provided - clearing parameter tree")
+ self.clear()
+ return
+
+ logger.debug(f"Setting up `ActiveRecordingTreeView` for recording: {recording_info_model.name}")
+ self.clear()
+ self.setParameters(
+ self._create_recording_status_parameter_tree(recording_info_model=recording_info_model),
+ )
+
+ def _create_recording_status_parameter_tree(self, recording_info_model: RecordingInfoModel):
+ parameter_group = Parameter.create(
+ name=f"Recording Name: {recording_info_model.name}",
+ type="group",
+ readonly=True,
+ children=[
+ dict(
+ name="Path",
+ type="str",
+ value=recording_info_model.path,
+ readonly=True,
+ ),
+ dict(
+ name="Calibration TOML",
+ type="str",
+ value=recording_info_model.calibration_toml_path,
+ readonly=True,
+ ),
+ dict(
+ name="Status",
+ type="group",
+ readonly=True,
+ children=[
+ dict(
+ name="Synchronized Videos Recorded",
+ type="str",
+ value=recording_info_model.synchronized_videos_status_check,
+ readonly=True,
+ ),
+ dict(
+ name="2D data exists?",
+ type="str",
+ value=recording_info_model.data2d_status_check,
+ readonly=True,
+ ),
+ dict(
+ name="3D data exists?",
+ type="str",
+ value=recording_info_model.data3d_status_check,
+ readonly=True,
+ ),
+ dict(
+ name="Center-of-Mass data exists?",
+ type="str",
+ value=recording_info_model.center_of_mass_data_status_check,
+ readonly=True,
+ ),
+ dict(
+ name="Blender scene file exists?",
+ type="str",
+ value=recording_info_model.blender_file_status_check,
+ readonly=True,
+ ),
+ ],
+ ),
+ ],
+ )
+
+ return parameter_group
+
+
+if __name__ == "__main__":
+ import sys
+
+ app = QApplication(sys.argv)
+ active_recording_widget = ActiveRecordingInfoWidget()
+ active_recording_widget.show()
+ sys.exit(app.exec())
diff --git a/freemocap/gui/qt/widgets/camera_controller_group_box.py b/freemocap/gui/qt/widgets/camera_controller_group_box.py
new file mode 100644
index 00000000..3a6a9d41
--- /dev/null
+++ b/freemocap/gui/qt/widgets/camera_controller_group_box.py
@@ -0,0 +1,162 @@
+from PyQt6.QtCore import Qt
+from PyQt6.QtWidgets import (
+ QGroupBox,
+ QVBoxLayout,
+ QHBoxLayout,
+ QLineEdit,
+ QFormLayout,
+ QLabel,
+ QRadioButton,
+ QCheckBox,
+ QWidget,
+)
+from skellycam import SkellyCamControllerWidget
+
+from freemocap.core_processes.capture_volume_calibration.charuco_stuff.default_charuco_square_size import (
+ default_charuco_square_size_mm,
+)
+from freemocap.system.paths_and_files_names import create_new_default_recording_name, create_new_recording_folder_path
+
+
+class RecordingNameGenerator:
+ pass
+
+
+class CameraControllerGroupBox(QGroupBox):
+ def __init__(self, skellycam_controller: SkellyCamControllerWidget, parent=None):
+ super().__init__(parent=parent)
+ self._skellycam_controller = skellycam_controller
+ skellycam_controller.start_recording_button.setObjectName("start_recording_button")
+ skellycam_controller.stop_recording_button.setObjectName("stop_recording_button")
+
+ # self.setFlat(True)
+ self._layout = QVBoxLayout()
+ self._layout.setAlignment(Qt.AlignmentFlag.AlignTop)
+ self.setLayout(self._layout)
+
+ # self._layout.setContentsMargins(0, 0, 0, 0)
+ # self._layout.setSpacing(0)
+ self._layout.setAlignment(Qt.AlignmentFlag.AlignTop)
+
+
+
+ motion_capture_recording_options_layout = self._create_mocap_recording_option_layout()
+ self._layout.addLayout(motion_capture_recording_options_layout)
+
+ calibration_recording_option_layout = self._create_calibration_recording_option_layout()
+ self._layout.addLayout(calibration_recording_option_layout)
+
+ self._layout.addLayout(self._create_videos_will_save_to_layout())
+
+ self._layout.addWidget(self._skellycam_controller)
+
+ def _create_videos_will_save_to_layout(self):
+ hbox = QHBoxLayout()
+ self._recording_string_tag_line_edit = QLineEdit(parent=self)
+ self._recording_string_tag_line_edit.setPlaceholderText("(Optional)")
+
+ recording_string_tag_form_layout = QFormLayout(parent=self)
+ recording_string_tag_form_layout.addRow("Tag:", self._recording_string_tag_line_edit)
+ hbox.addLayout(recording_string_tag_form_layout)
+
+ hbox.setAlignment(Qt.AlignmentFlag.AlignLeft)
+ videos_will_save_to_label = QLabel("Videos will save to folder: ")
+ videos_will_save_to_label.setStyleSheet("font-size: 10px;")
+ hbox.addWidget(videos_will_save_to_label)
+ self._recording_path_label = QLabel(f"{self.get_new_recording_path()}")
+ self._recording_path_label.setStyleSheet("font-family: monospace; font-size: 10px;")
+ hbox.addWidget(self._recording_path_label)
+ return hbox
+
+ def _create_mocap_recording_option_layout(self):
+ hbox = QHBoxLayout()
+ hbox.setAlignment(Qt.AlignmentFlag.AlignLeft)
+
+ self._mocap_videos_radio_button = QRadioButton("Record Motion Capture Videos")
+ hbox.addWidget(self._mocap_videos_radio_button)
+
+ self._mocap_videos_radio_button.setChecked(True)
+ hbox.addWidget(QLabel(" - "))
+ self._auto_process_videos_checkbox = QCheckBox("Auto Process Videos on Save")
+ self._auto_process_videos_checkbox.setChecked(True)
+ hbox.addWidget(self._auto_process_videos_checkbox)
+ self._auto_open_in_blender_checkbox = QCheckBox("Auto Open in Blender")
+ self._auto_open_in_blender_checkbox.setChecked(True)
+ hbox.addWidget(self._auto_open_in_blender_checkbox)
+ return hbox
+
+ def _create_calibration_recording_option_layout(self):
+ hbox = QHBoxLayout()
+ hbox.setAlignment(Qt.AlignmentFlag.AlignLeft)
+
+ self._calibration_videos_radio_button = QRadioButton("Record Calibration Videos")
+ hbox.addWidget(self._calibration_videos_radio_button)
+ hbox.addWidget(QLabel(" - "))
+ self._calibration_videos_radio_button.toggled.connect(self._handle_calibration_videos_radio_button_changed)
+
+ hbox.addWidget(QLabel("Charuco square size (mm)", parent=self))
+ self._charuco_square_size_line_edit = QLineEdit(parent=self)
+ self._charuco_square_size_line_edit.setFixedWidth(100)
+ self._charuco_square_size_line_edit.setText(str(default_charuco_square_size_mm))
+ self._charuco_square_size_line_edit.setToolTip(
+ "The length of one of the edges of the black squares in the calibration board in mm"
+ )
+ hbox.addWidget(self._charuco_square_size_line_edit)
+ hbox.addStretch()
+ return hbox
+
+ @property
+ def mocap_videos_radio_button_checked(self) -> bool:
+ return self._mocap_videos_radio_button.isChecked()
+
+ @property
+ def calibration_videos_radio_button_checked(self) -> bool:
+ return self._calibration_videos_radio_button.isChecked()
+
+ @property
+ def auto_process_videos_checked(self) -> bool:
+ return self._auto_process_videos_checkbox.isChecked()
+
+ @property
+ def auto_open_in_blender_checked(self) -> bool:
+ return self._auto_open_in_blender_checkbox.isChecked()
+
+ @property
+ def charuco_square_size(self) -> float:
+ return float(self._charuco_square_size_line_edit.text())
+
+ def get_new_recording_path(self):
+ return create_new_recording_folder_path(recording_name=self._get_recording_name())
+
+ def update_recording_name_string(self):
+ self._recording_path_label.setText(self.get_new_recording_path())
+
+ def _get_recording_name_string_tag(self):
+ try:
+ tag = self._recording_string_tag_line_edit.text()
+ tag = tag.replace(" ", " ")
+ tag = tag.replace(" ", " ")
+ tag = tag.replace(" ", "_")
+ return tag
+ except:
+ return ""
+
+ def _get_recording_name(self):
+ name = create_new_default_recording_name()
+ if self._calibration_videos_radio_button.isChecked():
+ name = f"{name}_calibration"
+
+ tag = self._get_recording_name_string_tag()
+ if tag == "":
+ return name
+ else:
+ return f"{name}__{self._get_recording_name_string_tag()}"
+
+ def _handle_calibration_videos_radio_button_changed(self, state):
+ if self._calibration_videos_radio_button.isChecked():
+ self.setProperty("calibration_videos_radio_button_checked", True)
+ self._skellycam_controller.set_calibration_recordings_button_label(True)
+ else:
+ self.setProperty("calibration_videos_radio_button_checked", False)
+ self._skellycam_controller.set_calibration_recordings_button_label(False)
+ self.style().polish(self)
diff --git a/freemocap/gui/qt/widgets/central_tab_widget.py b/freemocap/gui/qt/widgets/central_tab_widget.py
new file mode 100644
index 00000000..72ae86b0
--- /dev/null
+++ b/freemocap/gui/qt/widgets/central_tab_widget.py
@@ -0,0 +1,70 @@
+import logging
+
+from PyQt6.QtCore import Qt
+from PyQt6.QtWidgets import QTabWidget, QVBoxLayout, QWidget
+
+# from skelly_viewer import SkellyViewer
+from skellycam import SkellyCamWidget
+
+from freemocap.gui.qt.widgets.welcome_panel_widget import (
+ WelcomeToFreemocapPanel,
+)
+from freemocap.system.paths_and_files_names import SKULL_EMOJI_STRING, CAMERA_WITH_FLASH_EMOJI_STRING, EYES_EMOJI_STRING
+
+logger = logging.getLogger(__name__)
+
+
+class CentralTabWidget(QTabWidget):
+ def __init__(
+ self,
+ skelly_cam_widget: SkellyCamWidget,
+ camera_controller_widget: QWidget,
+ welcome_to_freemocap_widget: WelcomeToFreemocapPanel,
+ skelly_viewer_widget: QWidget,
+ parent=None,
+ ):
+ super().__init__(parent=parent)
+ self.parent = parent
+
+ # self.setTabShape(QTabWidget.TabShape.Triangular)
+
+ self._skelly_cam_widget = skelly_cam_widget
+ self._camera_controller_widget = camera_controller_widget
+ self._welcome_to_freemocap_widget = welcome_to_freemocap_widget
+ self._skelly_viewer_widget = skelly_viewer_widget
+
+ self._create_welcome_tab(self)
+ self._create_skellycam_view_tab(self)
+ self._create_skelly_viewer_tab(self)
+
+ def set_welcome_tab_enabled(self, enabled: bool):
+ self.setTabEnabled(0, enabled)
+
+ def set_camera_view_tab_enabled(self, enabled: bool):
+ self.setTabEnabled(1, enabled)
+
+ def set_visualize_data_tab_enabled(self, enabled: bool):
+ self.setTabEnabled(2, enabled)
+
+ def _create_welcome_tab(self, tab_widget: QTabWidget):
+ logger.info("Creating welcome tab")
+ tab_widget.addTab(self._welcome_to_freemocap_widget, "Welcome!")
+
+ def _create_skellycam_view_tab(self, tab_widget: QTabWidget):
+ logger.info("Creating skellycam view tab")
+ dummy_widget = QWidget()
+ self._camera_view_layout = QVBoxLayout()
+ self._camera_view_layout.setAlignment(Qt.AlignmentFlag.AlignTop)
+ dummy_widget.setLayout(self._camera_view_layout)
+ tab_widget.addTab(dummy_widget, f"Skelly Cam {CAMERA_WITH_FLASH_EMOJI_STRING}")
+ # tab_widget.setToolTip(skellycam.__repo_url__)
+
+ # self._qt_multi_camera_viewer_widget.resize(1280, 720)
+ self._camera_view_layout.addWidget(self._camera_controller_widget)
+
+ self._camera_view_layout.addWidget(self._skelly_cam_widget)
+
+ def _create_skelly_viewer_tab(self, tab_widget: QTabWidget):
+ logger.info("Creating export_data tab")
+ tab_widget.addTab(self._skelly_viewer_widget, f"Skelly Viewer {EYES_EMOJI_STRING}")
+ # tab_widget.setToolTip(skelly_viewer.__repo_url__)
diff --git a/src/core_processes/capture_volume_calibration/anipose_camera_calibration/__init__.py b/freemocap/gui/qt/widgets/control_panel/__init__.py
similarity index 100%
rename from src/core_processes/capture_volume_calibration/anipose_camera_calibration/__init__.py
rename to freemocap/gui/qt/widgets/control_panel/__init__.py
diff --git a/freemocap/gui/qt/widgets/control_panel/calibration_control_panel.py b/freemocap/gui/qt/widgets/control_panel/calibration_control_panel.py
new file mode 100644
index 00000000..b83a362f
--- /dev/null
+++ b/freemocap/gui/qt/widgets/control_panel/calibration_control_panel.py
@@ -0,0 +1,301 @@
+import logging
+import os
+import threading
+from pathlib import Path
+from typing import Callable, Union
+
+from PyQt6.QtCore import Qt
+from PyQt6.QtGui import QDoubleValidator
+from PyQt6.QtWidgets import (
+ QFileDialog,
+ QFormLayout,
+ QLabel,
+ QLineEdit,
+ QPushButton,
+ QRadioButton,
+ QVBoxLayout,
+ QWidget,
+ QHBoxLayout,
+ QLayout, QInputDialog, QDialogButtonBox, QDialog, QCheckBox,
+)
+
+from freemocap.system.paths_and_files_names import (
+ get_last_successful_calibration_toml_path,
+ get_calibrations_folder_path,
+)
+from freemocap.core_processes.capture_volume_calibration.charuco_stuff.default_charuco_square_size import (
+ default_charuco_square_size_mm,
+)
+from freemocap.gui.qt.workers.anipose_calibration_thread_worker import (
+ AniposeCalibrationThreadWorker,
+)
+
+logger = logging.getLogger(__name__)
+
+
+class CalibrationControlPanel(QWidget):
+ def __init__(self, get_active_recording_info_callable: Callable, kill_thread_event: threading.Event, parent=None):
+
+ super().__init__(parent=parent)
+ self._has_a_toml_path = False
+ self._calibration_toml_path = None
+ self._kill_thread_event = kill_thread_event
+
+ self._get_active_recording_info_callable = get_active_recording_info_callable
+ self.parent = parent
+
+ self._anipose_calibration_frame_worker = None
+ self._user_selected_calibration_toml_path_str = None
+
+ self._layout = QVBoxLayout()
+ self.setLayout(self._layout)
+
+ self._selected_calibration_toml_label = QLabel("")
+ self._selected_calibration_toml_label.setWordWrap(True)
+
+ self._layout.addWidget(self._selected_calibration_toml_label)
+
+ self._radio_button_layout = self._create_radio_button_layout()
+ self._radio_button_layout.setAlignment(Qt.AlignmentFlag.AlignTop)
+ self._layout.addLayout(self._radio_button_layout)
+ self._layout.addStretch()
+
+ @property
+ def calibration_toml_path(self) -> str:
+ return self._calibration_toml_path
+
+ @property
+ def radio_button_layout(self) -> QLayout:
+ return self._radio_button_layout
+
+ def _create_radio_button_layout(self):
+ radio_button_form_layout = QFormLayout()
+
+ radio_button_form_layout.addRow(self._create_use_most_recent_calibration_radio_button())
+
+ radio_button_form_layout.addRow(self._create_load_calibration_from_file_radio_button())
+
+ radio_button_form_layout.addRow(self._add_calibrate_from_active_recording_radio_button())
+
+ self.update_calibration_toml_path()
+ return radio_button_form_layout
+
+ def _create_load_calibration_from_file_radio_button(self) -> QLayout:
+ vbox_layout = QVBoxLayout()
+ radio_button_push_button_layout = QHBoxLayout()
+ vbox_layout.addLayout(radio_button_push_button_layout)
+
+ self._load_calibration_from_file_radio_button = QRadioButton("Load calibration from file")
+ radio_button_push_button_layout.addWidget(self._load_calibration_from_file_radio_button)
+ self._load_calibration_from_file_radio_button.toggled.connect(self._handle_load_calibration_from_file_toggled)
+
+ self._load_calibration_toml_dialog_button = QPushButton("Load Camera Calibration TOML...")
+ radio_button_push_button_layout.addWidget(self._load_calibration_toml_dialog_button)
+ # self._load_calibration_toml_dialog_button.setStyleSheet("font-size: 10pt;")
+ self._load_calibration_toml_dialog_button.clicked.connect(self.open_load_camera_calibration_toml_dialog)
+ self._load_calibration_toml_dialog_button.setEnabled(False)
+
+ return vbox_layout
+
+ def update_calibration_toml_path(self, toml_path: str = None):
+ if toml_path is None:
+ if self._load_calibration_from_file_radio_button.isChecked():
+ if self._user_selected_calibration_toml_path_str is not None:
+ toml_path = self._user_selected_calibration_toml_path_str
+ elif self._use_most_recent_calibration_radio_button.isChecked():
+ toml_path = get_last_successful_calibration_toml_path()
+ elif self._calibrate_from_active_recording_radio_button.isChecked():
+ active_recording_info = self._get_active_recording_info_callable()
+ if active_recording_info.calibration_toml_check:
+ toml_path = active_recording_info.calibration_toml_path
+ else:
+ active_rec = self._get_active_recording_info_callable()
+ if active_rec is not None:
+ if active_rec.calibration_toml_check:
+ toml_path = self._get_active_recording_info_callable().calibration_toml_path
+ self._load_calibration_from_file_radio_button.setChecked(True)
+ else:
+ toml_path = get_last_successful_calibration_toml_path()
+ self._use_most_recent_calibration_radio_button.setChecked(True)
+
+
+
+ self._calibration_toml_path = toml_path
+
+ if self._calibration_toml_path is not None:
+ logger.info(f"Setting calibration TOML path: {self._calibration_toml_path}")
+ self._show_selected_calibration_toml_path(self._calibration_toml_path)
+ else:
+ self._show_selected_calibration_toml_path('-Calibration File Not Found-')
+
+ def _add_calibrate_from_active_recording_radio_button(self):
+ vbox = QVBoxLayout()
+ hbox = QHBoxLayout()
+ vbox.addLayout(hbox)
+
+ self._calibrate_from_active_recording_radio_button = QRadioButton("Calibrate from Active Recording")
+ hbox.addWidget(self._calibrate_from_active_recording_radio_button)
+
+ self._calibrate_from_active_recording_radio_button.toggled.connect(
+ self._handle_calibrate_from_active_recording_toggled
+ )
+
+ self._calibrate_from_active_recording_button = QPushButton("Calibrate from Videos")
+ hbox.addWidget(self._calibrate_from_active_recording_button)
+
+ self._calibrate_from_active_recording_button.setEnabled(False)
+ self._calibrate_from_active_recording_button.clicked.connect(self.calibrate_from_active_recording)
+
+ self._charuco_square_size_form_layout = self._create_charuco_square_size_form_layout()
+ hbox2 = QHBoxLayout()
+ hbox2.addStretch()
+ hbox2.addLayout(self._charuco_square_size_form_layout)
+ vbox.addLayout(hbox2)
+ self._set_charuco_square_size_form_layout_visibility(False)
+
+ return vbox
+
+ def _create_use_most_recent_calibration_radio_button(self):
+
+ self._use_most_recent_calibration_radio_button = QRadioButton(f"Use most recent calibration")
+
+ self._use_most_recent_calibration_radio_button.toggled.connect(self._handle_use_most_recent_calibration_toggled)
+
+ self._use_most_recent_calibration_radio_button.setToolTip(get_last_successful_calibration_toml_path())
+
+ return self._use_most_recent_calibration_radio_button
+
+ def update_calibrate_from_active_recording_button_text(self):
+ active_recording_info = self._get_active_recording_info_callable()
+ if active_recording_info is None:
+ active_path_str = f"- No active recording selected -"
+ else:
+ if not active_recording_info.synchronized_videos_status_check:
+ active_path_str = f"Recording: {active_recording_info.name} has no synchronized videos!"
+ else:
+ active_path_str = f"Calibrate from Recording: {self._get_active_recording_info_callable().name}"
+
+ self._calibrate_from_active_recording_button.setToolTip(active_path_str)
+ self.update_calibration_toml_path()
+
+ def _handle_use_most_recent_calibration_toggled(self, checked):
+ pass
+ # if checked:
+ # self._most_recent_calibration_path_label.show()
+ # else:
+ # self._most_recent_calibration_path_label.hide()
+ self.update_calibration_toml_path()
+
+ def _handle_load_calibration_from_file_toggled(self, checked):
+ if checked:
+ self._load_calibration_toml_dialog_button.setEnabled(True)
+ else:
+ self._load_calibration_toml_dialog_button.setEnabled(False)
+
+ self.update_calibration_toml_path()
+
+ def _handle_calibrate_from_active_recording_toggled(self, checked):
+ active_recording_info = self._get_active_recording_info_callable()
+ self.update_calibrate_from_active_recording_button_text()
+ self.update_calibration_toml_path()
+
+ if checked and active_recording_info is not None and active_recording_info.synchronized_videos_status_check:
+ self._calibrate_from_active_recording_button.setEnabled(True)
+ self._set_charuco_square_size_form_layout_visibility(True)
+ else:
+ self._calibrate_from_active_recording_button.setEnabled(False)
+ self._set_charuco_square_size_form_layout_visibility(False)
+
+ def _set_charuco_square_size_form_layout_visibility(self, visible):
+ label_index = self._charuco_square_size_form_layout.indexOf(self._charuco_square_size_label)
+ line_edit_index = self._charuco_square_size_form_layout.indexOf(self._charuco_square_size_line_edit)
+ if visible:
+ self._charuco_square_size_form_layout.itemAt(label_index).widget().setEnabled(True)
+ self._charuco_square_size_form_layout.itemAt(line_edit_index).widget().setEnabled(True)
+ else:
+ self._charuco_square_size_form_layout.itemAt(label_index).widget().setEnabled(False)
+ self._charuco_square_size_form_layout.itemAt(line_edit_index).widget().setEnabled(False)
+
+ def open_load_camera_calibration_toml_dialog(self) -> str:
+ # from this tutorial - https://www.youtube.com/watch?v=gg5TepTc2Jg&t=649s
+ dialog = QFileDialog()
+ dialog.setFileMode(QFileDialog.FileMode.ExistingFile)
+
+ calibration_toml_path_selection = dialog.getOpenFileName(
+ self,
+ "Select 'toml' containing camera calibration info",
+ str(self._get_active_recording_info_callable().path),
+ "Camera Calibration TOML (*.toml)",
+ )
+ if len(calibration_toml_path_selection) > 0:
+ self._user_selected_calibration_toml_path_str = calibration_toml_path_selection[0]
+ logger.info(f"User selected camera calibration toml path:{self._user_selected_calibration_toml_path_str}")
+ self._show_selected_calibration_toml_path(self._user_selected_calibration_toml_path_str)
+ self.update_calibration_toml_path(toml_path=self._user_selected_calibration_toml_path_str)
+ return self.calibration_toml_path
+
+
+ def _show_selected_calibration_toml_path(self, calibration_toml_path_str: str):
+ self._calibration_toml_path = calibration_toml_path_str
+ path = calibration_toml_path_str.replace(os.sep, "/ ")
+ self._selected_calibration_toml_label.setText(path)
+ self._selected_calibration_toml_label.show()
+
+ def _create_charuco_square_size_form_layout(self):
+ charuco_square_size_form_layout = QFormLayout()
+
+ self._charuco_square_size_line_edit = QLineEdit()
+ self._charuco_square_size_line_edit.setValidator(QDoubleValidator())
+ self._charuco_square_size_line_edit.setFixedWidth(100)
+
+ self._charuco_square_size_label = QLabel("Charuco square size (mm)")
+ self._charuco_square_size_label.setStyleSheet("QLabel { font-size: 12px; }")
+
+ self._charuco_square_size_line_edit.setText(str(default_charuco_square_size_mm))
+ self._charuco_square_size_line_edit.setToolTip(
+ "The length of one of the edges of the black squares in the calibration board in mm"
+ )
+ charuco_square_size_form_layout.addRow(self._charuco_square_size_label, self._charuco_square_size_line_edit)
+ charuco_square_size_form_layout.setAlignment(Qt.AlignmentFlag.AlignRight)
+ return charuco_square_size_form_layout
+
+ def calibrate_from_active_recording(self, charuco_square_size_mm: float = None):
+
+ if not charuco_square_size_mm:
+ charuco_square_size_mm = float(self._charuco_square_size_line_edit.text())
+
+ active_recording_info = self._get_active_recording_info_callable()
+ if active_recording_info is None:
+ logger.error("Cannot calibrate from active recording - no active recording selected")
+ return
+
+ logger.info(f"Calibrating from active recording: {active_recording_info.name}")
+
+ if not active_recording_info.synchronized_videos_status_check:
+ logger.error(
+ f"Cannot calibrate from {active_recording_info.name} -"
+ f" `active_recording_info.synchronized_videos_status_check` is "
+ f"{active_recording_info.synchronized_videos_status_check}"
+ )
+
+ return
+
+ self._anipose_calibration_frame_worker = AniposeCalibrationThreadWorker(
+ calibration_videos_folder_path=active_recording_info.synchronized_videos_folder_path,
+ charuco_square_size=float(charuco_square_size_mm),
+ kill_thread_event=self._kill_thread_event,
+ )
+
+ self._anipose_calibration_frame_worker.start()
+
+ self._anipose_calibration_frame_worker.finished.connect(self.update_calibration_toml_path)
+
+
+if __name__ == "__main__":
+ from PyQt6.QtWidgets import QApplication
+ import sys
+
+ app = QApplication(sys.argv)
+ widget = CalibrationControlPanel()
+ widget.show()
+ sys.exit(app.exec())
diff --git a/freemocap/gui/qt/widgets/control_panel/control_panel_dock_widget.py b/freemocap/gui/qt/widgets/control_panel/control_panel_dock_widget.py
new file mode 100644
index 00000000..1679e2b1
--- /dev/null
+++ b/freemocap/gui/qt/widgets/control_panel/control_panel_dock_widget.py
@@ -0,0 +1,72 @@
+from PyQt6.QtCore import Qt
+from PyQt6.QtWidgets import (
+ QDockWidget,
+ QVBoxLayout,
+ QWidget,
+ QTabWidget,
+)
+from skellycam import SkellyCamParameterTreeWidget
+
+from freemocap.gui.qt.widgets.control_panel.process_mocap_data_panel.process_motion_capture_data_panel import (
+ ProcessMotionCaptureDataPanel,
+)
+from freemocap.system.paths_and_files_names import (
+ HAMMER_AND_WRENCH_EMOJI_STRING,
+ CAMERA_WITH_FLASH_EMOJI_STRING,
+ THREE_HEARTS_EMOJI_STRING,
+ ROBOT_EMOJI_STRING,
+ WIND_EMOJI_STRING,
+ SPARKLES_EMOJI_STRING,
+)
+
+
+class ControlPanelDockWidget(QDockWidget):
+ def __init__(self, **kwargs):
+ super().__init__("Control", parent=kwargs.get("parent"))
+
+ self.setFeatures(QDockWidget.DockWidgetFeature.DockWidgetMovable)
+ self.setFeatures(QDockWidget.DockWidgetFeature.DockWidgetFloatable)
+
+ self.setAllowedAreas(Qt.DockWidgetArea.LeftDockWidgetArea | Qt.DockWidgetArea.RightDockWidgetArea)
+
+ self._control_panel_widget = ControlPanelWidget(**kwargs)
+ self.setWidget(self._control_panel_widget)
+
+ @property
+ def tool_box(self):
+ return self._control_panel_widget.tab_widget
+
+
+class ControlPanelWidget(QWidget):
+ def __init__(
+ self,
+ camera_configuration_parameter_tree_widget: SkellyCamParameterTreeWidget,
+ # calibration_control_panel: CalibrationControlPanel,
+ process_motion_capture_data_panel: ProcessMotionCaptureDataPanel,
+ visualize_data_widget: QWidget,
+ parent=None,
+ ):
+ super().__init__(parent=parent)
+
+ self._layout = QVBoxLayout()
+ self.setLayout(self._layout)
+
+ self._tab_widget = QTabWidget(parent=self)
+ self._layout.addWidget(self._tab_widget)
+
+ self._tab_widget.addTab(
+ camera_configuration_parameter_tree_widget,
+ f"Camera Config {CAMERA_WITH_FLASH_EMOJI_STRING}{HAMMER_AND_WRENCH_EMOJI_STRING}",
+ )
+ # self._tool_box.addTab(calibration_control_panel, "Capture Volume Calibration")
+ self._tab_widget.addTab(
+ process_motion_capture_data_panel, f"Process MoCap Data {ROBOT_EMOJI_STRING}{THREE_HEARTS_EMOJI_STRING}"
+ )
+ self._tab_widget.addTab(visualize_data_widget, f"Export Data {WIND_EMOJI_STRING}{SPARKLES_EMOJI_STRING}")
+
+ self._tab_widget.setProperty("control_panel_tabs", True)
+ self.style().polish(self._tab_widget)
+
+ @property
+ def tab_widget(self):
+ return self._tab_widget
diff --git a/src/core_processes/capture_volume_calibration/charuco_board_detection/__init__.py b/freemocap/gui/qt/widgets/control_panel/process_mocap_data_panel/__init__.py
similarity index 100%
rename from src/core_processes/capture_volume_calibration/charuco_board_detection/__init__.py
rename to freemocap/gui/qt/widgets/control_panel/process_mocap_data_panel/__init__.py
diff --git a/src/core_processes/capture_volume_calibration/charuco_board_detection/dataclasses/__init__.py b/freemocap/gui/qt/widgets/control_panel/process_mocap_data_panel/parameter_groups/__init__.py
similarity index 100%
rename from src/core_processes/capture_volume_calibration/charuco_board_detection/dataclasses/__init__.py
rename to freemocap/gui/qt/widgets/control_panel/process_mocap_data_panel/parameter_groups/__init__.py
diff --git a/freemocap/gui/qt/widgets/control_panel/process_mocap_data_panel/parameter_groups/create_3d_triangulation_parameter_group.py b/freemocap/gui/qt/widgets/control_panel/process_mocap_data_panel/parameter_groups/create_3d_triangulation_parameter_group.py
new file mode 100644
index 00000000..1408c328
--- /dev/null
+++ b/freemocap/gui/qt/widgets/control_panel/process_mocap_data_panel/parameter_groups/create_3d_triangulation_parameter_group.py
@@ -0,0 +1,4 @@
+from pyqtgraph.parametertree import Parameter
+
+from freemocap.parameter_info_models.recording_processing_parameter_models import AniposeTriangulate3DParametersModel
+
diff --git a/freemocap/gui/qt/widgets/control_panel/process_mocap_data_panel/parameter_groups/create_parameter_groups.py b/freemocap/gui/qt/widgets/control_panel/process_mocap_data_panel/parameter_groups/create_parameter_groups.py
new file mode 100644
index 00000000..a36d5e5d
--- /dev/null
+++ b/freemocap/gui/qt/widgets/control_panel/process_mocap_data_panel/parameter_groups/create_parameter_groups.py
@@ -0,0 +1,167 @@
+from pyqtgraph.parametertree import Parameter, ParameterTree
+
+from freemocap.parameter_info_models.recording_processing_parameter_models import MediapipeParametersModel, \
+ RecordingProcessingParameterModel, AniposeTriangulate3DParametersModel, PostProcessingParametersModel, \
+ ButterworthFilterParametersModel
+
+BUTTERWORTH_ORDER = "Order"
+
+BUTTERWORTH_CUTOFF_FREQUENCY = "Cutoff Frequency"
+
+POST_PROCESSING_FRAME_RATE = "framerate"
+
+BUTTERWORTH_FILTER_TREE_NAME = "Butterworth Filter"
+
+USE_RANSAC_METHOD = "Use RANSAC Method"
+
+ANIPOSE_CONFIDENCE_CUTOFF = "Confidence Threshold Cut-off"
+
+ANIPOSE_TREE_NAME = "Anipose Triangulation"
+
+STATIC_IMAGE_MODE = "Static Image Mode"
+
+MINIUMUM_TRACKING_CONFIDENCE = "Minimum Tracking Confidence"
+
+MINIMUM_DETECTION_CONFIDENCE = "Minimum Detection Confidence"
+
+MODEL_COMPLEXITY = "Model Complexity"
+
+MEDIAPIPE_TREE_NAME = "Mediapipe"
+
+
+def create_mediapipe_parameter_group(
+ parameter_model: MediapipeParametersModel = MediapipeParametersModel(),
+) -> Parameter:
+ model_complexity_list = [
+ "0 (Fastest/Least accurate)",
+ "1 (Middle ground)",
+ "2 (Slowest/Most accurate)",
+ ]
+ return Parameter.create(
+ name=MEDIAPIPE_TREE_NAME,
+ type="group",
+ children=[
+ dict(
+ name=MODEL_COMPLEXITY,
+ type="list",
+ limits=model_complexity_list,
+ value=model_complexity_list[parameter_model.model_complexity],
+ tip="Which Mediapipe model to use - higher complexity is slower but more accurate. "
+ "Variable name in `mediapipe` code: `model_complexity`",
+ ),
+ dict(
+ name=MINIMUM_DETECTION_CONFIDENCE,
+ type="float",
+ value=parameter_model.min_detection_confidence,
+ step=0.05,
+ limits=(0.0, 1.0),
+ tip="Minimum confidence for a skeleton detection to be considered valid. "
+ "Variable name in `mediapipe` code: `min_detection_confidence`."
+ "NOTE - Never trust a machine learning model's estimates of their own confidence!",
+ ),
+ dict(
+ name=MINIUMUM_TRACKING_CONFIDENCE,
+ type="float",
+ value=parameter_model.min_tracking_confidence,
+ step=0.05,
+ limits=(0.0, 1.0),
+ tip="Minimum confidence needed to use the previous frame's skeleton estiamte to predict the next one"
+ "Variable name in `mediapipe` code: `min_tracking_confidence`.",
+ ),
+ dict(
+ name=STATIC_IMAGE_MODE,
+ type="bool",
+ value=parameter_model.static_image_mode,
+ tip="If true, the model will process each image independently, without tracking across frames."
+ "I think this is equivalent to setting `min_tracking_confidence` to 0.0"
+ "Variable name in `mediapipe` code: `static_image_mode`",
+ ),
+ ],
+ )
+
+
+def create_3d_triangulation_prarameter_group(
+ parameter_model: AniposeTriangulate3DParametersModel = AniposeTriangulate3DParametersModel(),
+) -> Parameter:
+ return Parameter.create(
+ name=ANIPOSE_TREE_NAME,
+ type="group",
+ children=[
+ dict(
+ name=ANIPOSE_CONFIDENCE_CUTOFF,
+ type="float",
+ value=parameter_model.confidence_threshold_cutoff,
+ tip="Confidence threshold cut-off for triangulation. "
+ "NOTE - Never trust a machine learning model's estimates of their own confidence! "
+ "TODO - Something similar that uses `reprojection_error` instead of `confidence`",
+ ),
+ dict(
+ name=USE_RANSAC_METHOD,
+ type="bool",
+ value=parameter_model.use_triangulate_ransac_method,
+ tip="If true, use `anipose`'s `triangulate_ransac` method instead of the default `triangulate_simple` method. "
+ "NOTE - Much slower than the 'simple' method, but might be more accurate and better at rejecting bad camera views. Needs more testing and evaluation to see if it's worth it. ",
+ ),
+ ],
+ )
+
+
+def create_post_processing_parameter_group(
+ parameter_model: PostProcessingParametersModel = PostProcessingParametersModel(),
+) -> Parameter:
+ return Parameter.create(
+ name=BUTTERWORTH_FILTER_TREE_NAME,
+ type="group",
+ children=[
+ dict(
+ name=POST_PROCESSING_FRAME_RATE,
+ type="float",
+ value=parameter_model.butterworth_filter_parameters.sampling_rate,
+ tip="Framerate of the recording " "TODO - Calculate this from the recorded timestamps....",
+ ),
+ dict(
+ name=BUTTERWORTH_CUTOFF_FREQUENCY,
+ type="float",
+ value=parameter_model.butterworth_filter_parameters.cutoff_frequency,
+ tip="Oscillations above this frequency will be filtered from the data. ",
+ ),
+ dict(
+ name=BUTTERWORTH_ORDER,
+ type="int",
+ value=parameter_model.butterworth_filter_parameters.order,
+ tip="Order of the filter."
+ "NOTE - I'm not really sure what this parameter does, but this is what I see in other people's Methods sections so.... lol",
+ ),
+ ],
+ tip="Low-pass, zero-lag, Butterworth filter to remove high frequency oscillations/noise from the data. ",
+ )
+
+
+def extract_mediapipe_parameter_model_from_parameter_tree(
+ parameter_tree: ParameterTree,
+) -> RecordingProcessingParameterModel:
+ return RecordingProcessingParameterModel(
+ mediapipe_parameters_model=MediapipeParametersModel(
+ model_complexity=parameter_tree.param(MEDIAPIPE_TREE_NAME).param(MODEL_COMPLEXITY).value(),
+ min_detection_confidence=parameter_tree.param(MEDIAPIPE_TREE_NAME).param(
+ MINIMUM_DETECTION_CONFIDENCE).value(),
+ min_tracking_confidence=parameter_tree.param(MEDIAPIPE_TREE_NAME).param(
+ MINIUMUM_TRACKING_CONFIDENCE).value(),
+ static_image_mode=parameter_tree.param(MEDIAPIPE_TREE_NAME).param(STATIC_IMAGE_MODE).value(), ),
+
+ anipose_triangulate_3d_parameters_model=AniposeTriangulate3DParametersModel(
+ confidence_threshold_cutoff=parameter_tree.param(ANIPOSE_TREE_NAME).param(
+ ANIPOSE_CONFIDENCE_CUTOFF).value(),
+ use_triangulate_ransac_method=parameter_tree.param(ANIPOSE_TREE_NAME).param(USE_RANSAC_METHOD).value(),
+ ),
+ post_processing_parameters_model=PostProcessingParametersModel(
+ framerate=parameter_tree.param(BUTTERWORTH_FILTER_TREE_NAME).param(POST_PROCESSING_FRAME_RATE).value(),
+ butterworth_filter_parameters=ButterworthFilterParametersModel(
+ sampling_rate=parameter_tree.param(BUTTERWORTH_FILTER_TREE_NAME).param(
+ POST_PROCESSING_FRAME_RATE).value(),
+ cutoff_frequency=parameter_tree.param(BUTTERWORTH_FILTER_TREE_NAME).param(
+ BUTTERWORTH_CUTOFF_FREQUENCY).value(),
+ order=parameter_tree.param(BUTTERWORTH_FILTER_TREE_NAME).param(BUTTERWORTH_ORDER).value(),
+ ),
+ )
+ ) #thanks github co-pilot lol
diff --git a/freemocap/gui/qt/widgets/control_panel/process_mocap_data_panel/process_motion_capture_data_panel.py b/freemocap/gui/qt/widgets/control_panel/process_mocap_data_panel/process_motion_capture_data_panel.py
new file mode 100644
index 00000000..6fca084e
--- /dev/null
+++ b/freemocap/gui/qt/widgets/control_panel/process_mocap_data_panel/process_motion_capture_data_panel.py
@@ -0,0 +1,216 @@
+import logging
+import threading
+from pathlib import Path
+from typing import Callable
+
+from PyQt6.QtCore import pyqtSignal, pyqtSlot, Qt
+from PyQt6.QtWidgets import QPushButton, QVBoxLayout, QWidget, QGroupBox
+from pyqtgraph.parametertree import Parameter, ParameterTree
+
+from freemocap.gui.qt.widgets.control_panel.calibration_control_panel import CalibrationControlPanel
+
+from freemocap.gui.qt.widgets.control_panel.process_mocap_data_panel.parameter_groups.create_parameter_groups import (
+ create_mediapipe_parameter_group, extract_mediapipe_parameter_model_from_parameter_tree,
+ create_3d_triangulation_prarameter_group, create_post_processing_parameter_group,
+)
+
+from freemocap.gui.qt.workers.process_motion_capture_data_thread_worker import (
+ ProcessMotionCaptureDataThreadWorker,
+)
+from freemocap.parameter_info_models.recording_processing_parameter_models import (
+ RecordingProcessingParameterModel,
+)
+
+logger = logging.getLogger(__name__)
+
+
+class ProcessMotionCaptureDataPanel(QWidget):
+ processing_finished_signal = pyqtSignal()
+
+ def __init__(
+ self,
+ recording_processing_parameters: RecordingProcessingParameterModel,
+ get_active_recording_info: Callable,
+ kill_thread_event: threading.Event,
+ parent=None,
+ ):
+ super().__init__(parent=parent)
+
+ self._kill_thread_event = kill_thread_event
+ self._get_active_recording_info = get_active_recording_info
+ self._recording_processing_parameter_model = recording_processing_parameters
+ self._recording_processing_parameter_model.recording_info_model = self._get_active_recording_info()
+
+ self._layout = QVBoxLayout()
+ self._layout.setAlignment(Qt.AlignmentFlag.AlignTop)
+ self.setLayout(self._layout)
+
+ calibration_group_box = QGroupBox("Selected Capture Volume Calibration TOML:")
+ vbox = QVBoxLayout()
+ calibration_group_box.setLayout(vbox)
+ self._layout.addWidget(calibration_group_box)
+
+ self._calibration_control_panel = CalibrationControlPanel(
+ get_active_recording_info_callable=self._get_active_recording_info,
+ kill_thread_event=self._kill_thread_event,
+ parent=self,
+ )
+ vbox.addWidget(self._calibration_control_panel)
+
+ self._process_motion_capture_data_button = QPushButton(
+ "Process Motion Capture Videos",
+ )
+ self._process_motion_capture_data_button.clicked.connect(self._launch_process_motion_capture_data_thread_worker)
+ self._layout.addWidget(self._process_motion_capture_data_button)
+
+ self._parameter_tree_widget = ParameterTree(parent=self, showHeader=False)
+ self._layout.addWidget(self._parameter_tree_widget)
+
+ self._add_parameters_to_parameter_tree_widget(
+ self._parameter_tree_widget,
+ session_processing_parameter_model=self._recording_processing_parameter_model,
+ )
+
+ self._process_motion_capture_data_thread_worker = None
+
+ @property
+ def process_motion_capture_data_button(self):
+ return self._process_motion_capture_data_button
+
+ def calibrate_from_active_recording(self, charuco_square_size_mm: float):
+ self._calibration_control_panel.calibrate_from_active_recording(charuco_square_size_mm=charuco_square_size_mm)
+
+ def update_calibration_path(self) -> bool:
+ self._calibration_control_panel.update_calibrate_from_active_recording_button_text()
+ return self._calibration_control_panel.update_calibration_toml_path()
+
+ def _add_parameters_to_parameter_tree_widget(
+ self,
+ parameter_tree_widget: ParameterTree,
+ session_processing_parameter_model: RecordingProcessingParameterModel,
+ ):
+ parameter_group = self._convert_session_processing_parameter_model_to_parameter_group(
+ session_processing_parameter_model
+ )
+ parameter_tree_widget.setParameters(parameter_group, showTop=False)
+
+ return parameter_group
+
+ def _convert_session_processing_parameter_model_to_parameter_group(
+ self,
+ session_processing_parameter_model: RecordingProcessingParameterModel,
+ ):
+
+ return Parameter.create(
+ name="Processing Parameters",
+ type="group",
+ children=[
+ dict(
+ name="2d Image Trackers",
+ type="group",
+ children=[
+ self._create_new_skip_this_step_parameter(),
+ create_mediapipe_parameter_group(session_processing_parameter_model.mediapipe_parameters_model),
+ ],
+ tip="Methods for tracking 2d points in images (e.g. mediapipe, deeplabcut(TODO), openpose(TODO), etc ...)",
+ ),
+ dict(
+ name="3d triangulation methods",
+ type="group",
+ children=[
+ self._create_new_skip_this_step_parameter(),
+ create_3d_triangulation_prarameter_group(
+ session_processing_parameter_model.anipose_triangulate_3d_parameters_model
+ ),
+ ],
+ tip="Methods for triangulating 3d points from 2d points (using epipolar geometry and the 'camera_calibration' data).",
+ ),
+ dict(
+ name="Post Processing (data cleaning)",
+ type="group",
+ children=[
+ self._create_new_skip_this_step_parameter(),
+ create_post_processing_parameter_group(
+ session_processing_parameter_model.post_processing_parameters_model
+ ),
+ ],
+ tip="Methods for cleaning up the data (e.g. filtering/smoothing, gap filling, etc ...)"
+ "TODO - Add/expose more post processing methods here (e.g. gap filling, outlier removal, etc ...)",
+ ),
+ ],
+ )
+
+ def _extract_session_parameter_model_from_parameter_tree(
+ self,
+ ) -> RecordingProcessingParameterModel:
+ # rec = extract_mediapipe_parameter_model_from_parameter_tree(self._parameter_tree_widget)
+ logger.debug("TODO - extract session parameter model from parameter tree")
+ rec = self._recording_processing_parameter_model
+ rec.recording_info_model = self._get_active_recording_info()
+
+ if self._calibration_control_panel.calibration_toml_path:
+ rec.recording_info_model.calibration_toml_path = self._calibration_control_panel.calibration_toml_path
+ else:
+ rec.recording_info_model.calibration_toml_path = self._calibration_control_panel.open_load_camera_calibration_toml_dialog()
+
+ if not rec.recording_info_model.calibration_toml_path:
+ logger.error(
+ "No calibration TOML selected - Processing will fail at the '3d triangulation' step (but it will get through the 'Tracking things in 2d images' step).")
+
+ return rec
+
+ def _create_new_skip_this_step_parameter(self):
+ parameter = Parameter.create(
+ name="Skip this step?",
+ type="bool",
+ value=False,
+ tip="If you have already run this step, you can skip it." "re-running it will overwrite the existing data.",
+ )
+ parameter.sigValueChanged.connect(self.disable_this_parameter_group)
+
+ return parameter
+
+ def disable_this_parameter_group(self, parameter, changes):
+ logger.debug(f"TODO - disable parameter group when 'skip this step?' is checked")
+ pass
+ # skip_this_step_bool = parameter.value()
+ # parameter_group = parameter.parent()
+ # for child in parameter_group.children():
+ # if child.name() != "Skip this step?":
+ # logger.debug(f"Disabling {child.name()}")
+ # child.setOpts(enabled=not skip_this_step_bool)
+
+ def _launch_process_motion_capture_data_thread_worker(self):
+ logger.debug("Launching process motion capture data process")
+ session_parameter_model = self._extract_session_parameter_model_from_parameter_tree()
+ session_parameter_model.recording_info_model = self._get_active_recording_info()
+
+ if session_parameter_model.recording_info_model is None:
+ logger.error("No active recording selected.")
+ return
+ if not Path(session_parameter_model.recording_info_model.path).exists():
+ logger.error(f"Recording path does not exist: {session_parameter_model.recording_info_model.path}.")
+ return
+
+ session_parameter_model.recording_info_model.calibration_toml_path = self._calibration_control_panel.calibration_toml_path
+
+ self._process_motion_capture_data_thread_worker = ProcessMotionCaptureDataThreadWorker(session_parameter_model,
+ kill_event=self._kill_thread_event)
+ self._process_motion_capture_data_thread_worker.start()
+
+ self._process_motion_capture_data_thread_worker.finished.connect(self._handle_finished_signal)
+
+ @pyqtSlot()
+ def _handle_finished_signal(self):
+ logger.debug("Process motion capture data process finished.")
+ self.processing_finished_signal.emit()
+
+
+if __name__ == "__main__":
+ from PyQt6.QtWidgets import QApplication
+ import sys
+
+ app = QApplication(sys.argv)
+ window = ProcessMotionCaptureDataPanel()
+ window.show()
+ app.exec()
diff --git a/freemocap/gui/qt/widgets/control_panel/visualization_control_panel.py b/freemocap/gui/qt/widgets/control_panel/visualization_control_panel.py
new file mode 100644
index 00000000..4ee7a681
--- /dev/null
+++ b/freemocap/gui/qt/widgets/control_panel/visualization_control_panel.py
@@ -0,0 +1,51 @@
+from PyQt6.QtCore import Qt
+from PyQt6.QtWidgets import QGroupBox, QVBoxLayout, QPushButton, QRadioButton, QWidget, QCheckBox
+
+
+class VisualizationControlPanel(QWidget):
+ def __init__(self, parent=None):
+ super().__init__(parent=parent)
+ self._layout = QVBoxLayout()
+ self.setLayout(self._layout)
+
+ groupbox = QGroupBox("Export to Blender", parent=self)
+ self._layout.addWidget(groupbox)
+ vbox = QVBoxLayout()
+ vbox.setContentsMargins(0, 0, 0, 0)
+ vbox.setAlignment(Qt.AlignmentFlag.AlignTop)
+ groupbox.setLayout(vbox)
+
+ self._export_to_blender_button = QPushButton("Export to Blender")
+ groupbox.layout().addWidget(self._export_to_blender_button)
+
+ self._open_in_blender_automatically_checkbox = QCheckBox("Open in Blender automatically")
+ self._open_in_blender_automatically_checkbox.setChecked(True)
+ # groupbox.layout().addWidget(self._open_in_blender_automatically_checkbox)
+
+ self._use_default_method_radio_button = QRadioButton("Use default method (Recommended)")
+ self._use_default_method_radio_button.setChecked(True)
+ groupbox.layout().addWidget(self._use_default_method_radio_button)
+
+ self._use_legacy_method_radio_button = QRadioButton("Use legacy method")
+ groupbox.layout().addWidget(self._use_legacy_method_radio_button)
+
+ self._use_cgtinker_method_radio_button = QRadioButton("Use @cgtinker method (Work in progress)")
+ groupbox.layout().addWidget(self._use_cgtinker_method_radio_button)
+
+ @property
+ def export_to_blender_button(self):
+ return self._export_to_blender_button
+
+ @property
+ def open_in_blender_automatically_box_is_checked(self):
+ return self._open_in_blender_automatically_checkbox.isChecked()
+
+ def get_user_selected_method_string(self):
+ if self._use_default_method_radio_button.isChecked():
+ return "megascript_take2"
+
+ if self._use_legacy_method_radio_button.isChecked():
+ return "alpha_megascript"
+
+ if self._use_cgtinker_method_radio_button.isChecked():
+ return "cgtinker"
diff --git a/freemocap/gui/qt/widgets/control_panel_dock_widget.py b/freemocap/gui/qt/widgets/control_panel_dock_widget.py
new file mode 100644
index 00000000..126ed2db
--- /dev/null
+++ b/freemocap/gui/qt/widgets/control_panel_dock_widget.py
@@ -0,0 +1,71 @@
+from PyQt6.QtCore import Qt
+from PyQt6.QtWidgets import (
+ QDockWidget,
+ QLabel,
+ QSplitter,
+ QVBoxLayout,
+ QWidget,
+)
+from skellycam import SkellyCamParameterTreeWidget
+
+from freemocap.gui.qt.widgets.control_panel.calibration_control_panel import (
+ CalibrationControlPanel,
+)
+from freemocap.gui.qt.widgets.control_panel.process_mocap_data_panel.process_motion_capture_data_panel import (
+ ProcessMotionCaptureDataPanel,
+)
+
+
+class ControlPanelDockWidget(QDockWidget):
+ def __init__(
+ self,
+ camera_configuration_parameter_tree_widget: SkellyCamParameterTreeWidget,
+ calibration_control_panel: CalibrationControlPanel,
+ process_motion_capture_data_panel: ProcessMotionCaptureDataPanel,
+ visualize_data_widget: QWidget,
+ parent=None,
+ ):
+ super().__init__(parent=parent)
+
+ self._splitter = QSplitter()
+ self._splitter.setOrientation(Qt.Orientation.Vertical)
+ self.setWidget(self._splitter)
+
+ self._add_widget_to_splitter(
+ widget=camera_configuration_parameter_tree_widget,
+ title_str="Camera Configuration",
+ )
+
+ self._add_widget_to_splitter(
+ widget=calibration_control_panel,
+ title_str="Capture Volume Calibration",
+ )
+
+ self._add_widget_to_splitter(
+ widget=process_motion_capture_data_panel,
+ title_str="Process Motion Capture Data",
+ )
+
+ self._add_widget_to_splitter(
+ widget=visualize_data_widget,
+ title_str="Visualize Motion Capture Data",
+ add_stretch=True,
+ )
+
+ def _add_widget_to_splitter(self, widget: QWidget, title_str: str, add_stretch: bool = False):
+ dummy_widget = QWidget()
+ layout = QVBoxLayout()
+ dummy_widget.setLayout(layout)
+ layout.addWidget(self._create_section_title(title=title_str))
+ layout.addWidget(widget)
+ if add_stretch:
+ layout.addStretch()
+
+ self._splitter.addWidget(dummy_widget)
+
+ def _create_section_title(self, title: str):
+ label = QLabel(title)
+ label.setAlignment(Qt.AlignmentFlag.AlignCenter)
+ label.setAlignment(Qt.AlignmentFlag.AlignTop)
+ label.setStyleSheet("font-size: 20px; font-weight: bold;")
+ return label
diff --git a/freemocap/gui/qt/widgets/directory_view_widget.py b/freemocap/gui/qt/widgets/directory_view_widget.py
new file mode 100644
index 00000000..90367b1c
--- /dev/null
+++ b/freemocap/gui/qt/widgets/directory_view_widget.py
@@ -0,0 +1,154 @@
+import logging
+from copy import copy
+from pathlib import Path
+from typing import Union, Callable
+
+from PyQt6.QtCore import pyqtSignal, Qt
+from PyQt6.QtGui import QFileSystemModel
+from PyQt6.QtWidgets import QLabel, QMenu, QTreeView, QVBoxLayout, QWidget, QPushButton
+from qtpy import QtGui
+
+from freemocap.system.paths_and_files_names import get_recording_session_folder_path
+from freemocap.system.start_file import open_file
+
+logger = logging.getLogger(__name__)
+
+
+class DirectoryViewWidget(QWidget):
+ new_active_recording_selected_signal = pyqtSignal(str)
+
+ def __init__(self, top_level_folder_path: Union[str, Path], get_active_recording_info_callable: Callable):
+ self._root_folder = None
+ logger.info("Creating QtDirectoryViewWidget")
+ super().__init__()
+ self._minimum_width = 300
+ self.setMinimumWidth(self._minimum_width)
+
+ self._top_level_folder_path = top_level_folder_path
+ self._get_active_recording_info_callable = get_active_recording_info_callable
+
+ self._layout = QVBoxLayout()
+ self.setLayout(self._layout)
+
+ self._file_system_model = QFileSystemModel()
+
+ self._tree_view_widget = QTreeView()
+ self._tree_view_widget.setHeaderHidden(False)
+
+ self._layout.addWidget(self._tree_view_widget)
+
+ self._tree_view_widget.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu)
+ self._tree_view_widget.customContextMenuRequested.connect(self._context_menu)
+ self._tree_view_widget.doubleClicked.connect(self._open_file)
+
+ self._tree_view_widget.setModel(self._file_system_model)
+
+ self._tree_view_widget.setAlternatingRowColors(True)
+ self._tree_view_widget.setColumnWidth(0, 250)
+
+ if self._top_level_folder_path is not None:
+ self.set_folder_as_root(self._top_level_folder_path)
+
+ self._show_freemocap_data_folder_button = QPushButton("Show FreeMoCap Data Folder")
+ self._show_freemocap_data_folder_button.clicked.connect(
+ lambda: self.set_folder_as_root(self._top_level_folder_path)
+ )
+
+ self._layout.addWidget(self._show_freemocap_data_folder_button)
+
+ self._path_label = QLabel(str(self._top_level_folder_path))
+ self._layout.addWidget(self._path_label)
+
+ def expand_directory_to_path(self, path: Union[str, Path], collapse_other_directories: bool = True):
+ if collapse_other_directories:
+ logger.debug("Collapsing other directories")
+ self._tree_view_widget.collapseAll()
+ logger.debug(f"Expanding directory at path: {str(path)}")
+ og_index = self._file_system_model.index(str(path))
+ self._tree_view_widget.expand(og_index)
+
+ parent_path = copy(path)
+ while Path(self._file_system_model.rootPath()) in Path(parent_path).parents:
+ parent_path = Path(parent_path).parent
+ index = self._file_system_model.index(str(parent_path))
+ logger.debug(f"Expanding parent directory at path: {str(parent_path)}")
+ self._tree_view_widget.expand(index)
+
+ self._tree_view_widget.scrollTo(og_index)
+
+ def set_folder_as_root(self, folder_path: Union[str, Path]):
+ logger.info(f"Setting root folder to {str(folder_path)}")
+ self._root_folder = folder_path
+ self._tree_view_widget.setWindowTitle(str(folder_path))
+ self._file_system_model.setRootPath(str(folder_path))
+ self._tree_view_widget.setRootIndex(self._file_system_model.index(str(folder_path)))
+ self._tree_view_widget.setColumnWidth(0, int(self._minimum_width * 0.9))
+
+ def _context_menu(self):
+ menu = QMenu()
+ open = menu.addAction("Open file")
+ open.triggered.connect(self._open_file)
+
+ set_as_active_recording = menu.addAction("Set as Active Recording folder")
+ set_as_active_recording.triggered.connect(self._set_recording_as_active)
+
+ go_to_parent_directory = menu.addAction("Go to parent directory")
+ go_to_parent_directory.triggered.connect(self._go_to_parent_directory)
+
+ cursor = QtGui.QCursor()
+ menu.exec(cursor.pos())
+
+ def _open_file(self):
+ index = self._tree_view_widget.currentIndex()
+ file_path = self._file_system_model.filePath(index)
+ logger.info(f"Opening file from file_system_view_widget: {file_path}")
+ open_file(file_path)
+
+ def _set_recording_as_active(self):
+ index = self._tree_view_widget.currentIndex()
+ file_path = Path(self._file_system_model.filePath(index))
+ logger.info(f"Setting {file_path} as 'Active Recording' folder")
+ self.new_active_recording_selected_signal.emit(str(file_path))
+
+ def _go_to_parent_directory(self):
+ logger.debug(f"Setting parent directory as root: {Path(self._root_folder).parent}")
+ self.set_folder_as_root(Path(self._root_folder).parent)
+ self.expand_directory_to_path(self._root_folder, collapse_other_directories=False)
+
+ def set_path_as_index(self, path: Union[str, Path]):
+ logger.info(f"Setting current index to : {str(path)}")
+ self._tree_view_widget.setCurrentIndex(self._file_system_model.index(str(path)))
+
+ def handle_new_active_recording_selected(self) -> None:
+ current_recording_info = self._get_active_recording_info_callable()
+ if current_recording_info is None:
+ # self.set_folder_as_root(self._top_level_folder_path)
+ self._show_freemocap_data_folder_button.hide()
+ self.expand_directory_to_path(get_recording_session_folder_path())
+ return
+
+ # self.set_folder_as_root(current_recording_info.path)
+ self._tree_view_widget.setCurrentIndex(self._file_system_model.index(str(current_recording_info.path)))
+
+ if current_recording_info.annotated_videos_folder_path is not None:
+ self.expand_directory_to_path(current_recording_info.annotated_videos_folder_path)
+ elif current_recording_info.synchronized_videos_folder_path is not None:
+ self.expand_directory_to_path(current_recording_info.synchronized_videos_folder_path)
+ else:
+ self.expand_directory_to_path(current_recording_info.path)
+
+
+if __name__ == "__main__":
+ import sys
+
+ from PyQt6.QtWidgets import QApplication
+
+ app = QApplication(sys.argv)
+ directory_view_widget = DirectoryViewWidget(top_level_folder_path=Path.home())
+
+ directory_view_widget.show()
+
+ # index = directory_view_widget.expand_directory_to_path(Path.home() / ".atom")
+ directory_view_widget.expand_directory_to_path(Path.home() / "Downloads")
+
+ sys.exit(app.exec())
diff --git a/freemocap/gui/qt/widgets/import_videos_window.py b/freemocap/gui/qt/widgets/import_videos_window.py
new file mode 100644
index 00000000..2d15140b
--- /dev/null
+++ b/freemocap/gui/qt/widgets/import_videos_window.py
@@ -0,0 +1,115 @@
+import logging
+from pathlib import Path
+from typing import Union
+
+from PyQt6.QtCore import pyqtSignal
+from PyQt6.QtGui import QFileSystemModel
+from PyQt6.QtWidgets import QFileDialog, QWidget, QVBoxLayout, QListView, QListWidget, QLabel, QFormLayout, QLineEdit, \
+ QTreeView, QPushButton, QDialog, QDialogButtonBox, QInputDialog
+
+from freemocap.system.paths_and_files_names import get_recording_session_folder_path, SYNCHRONIZED_VIDEOS_FOLDER_NAME
+from freemocap.system.start_file import open_file
+
+no_files_found_string = "No '.mp4' video files found! \n \n Note - We only look for `.mp4` files (for now). If your videos are a different format, convert them to `mp4` via online tools like `www.cloudconvert.com`, or softwares like `HandBrake`, `ffmpeg` or any video editing software"
+
+
+logger = logging.getLogger(__name__)
+
+class ImportVideosWizard(QDialog):
+ folder_to_save_videos_to_selected = pyqtSignal(list, str)
+ def __init__(self,
+ import_videos_path: Union[str, Path],
+ parent=None):
+ super().__init__(parent=parent)
+
+ self.setWindowTitle("Import Videos")
+
+
+
+ self._layout = QVBoxLayout()
+ self.setLayout(self._layout)
+
+ self._import_directory_view = self._create_import_directory_view(import_videos_path)
+ self._layout.addWidget(self._import_directory_view)
+
+ self._video_file_paths = [str(path) for path in Path(import_videos_path).glob('*.mp4')]
+
+ self._video_file_list_view = self._create_video_file_list_widget()
+ self._layout.addWidget(self._video_file_list_view)
+
+ self._form_layout = QFormLayout()
+ self._layout.addLayout(self._form_layout)
+
+ self._folder_name = f"import_{Path(import_videos_path).name}"
+ self._folder_name_line_edit = QLineEdit(parent=self)
+ self._folder_name_line_edit.textChanged.connect(self._handle_folder_name_line_edit_changed)
+
+ self._folder_name_line_edit.setPlaceholderText(self._folder_name)
+ self._form_layout.addRow("Recording Name:", self._folder_name_line_edit)
+
+ self._folder_where_videos_will_be_saved_to_label = QLabel(self._get_folder_videos_will_be_saved_to())
+ self._form_layout.addRow("Videos will be saved to:", self._folder_where_videos_will_be_saved_to_label)
+
+ self._continue_button = QPushButton("Continue")
+ self._continue_button.isDefault()
+ self._continue_button.clicked.connect(self._handle_continue_button_clicked)
+ self._form_layout.addRow(self._continue_button)
+
+
+
+ def _get_folder_videos_will_be_saved_to(self):
+ return str(Path(get_recording_session_folder_path()) / self._folder_name / SYNCHRONIZED_VIDEOS_FOLDER_NAME)
+
+ def _create_import_directory_view(self, import_videos_path: Union[str, Path]):
+
+ self._file_system_model = QFileSystemModel()
+ self._file_system_model.setRootPath(str(import_videos_path))
+
+ self._tree_view_widget = QTreeView()
+ self._layout.addWidget(self._tree_view_widget)
+ self._tree_view_widget.setModel(self._file_system_model)
+ self._tree_view_widget.setRootIndex(self._file_system_model.index(str(import_videos_path)))
+ self._tree_view_widget.setColumnWidth(0, 250)
+ self._tree_view_widget.setHeaderHidden(False)
+ self._tree_view_widget.setAlternatingRowColors(True)
+ self._tree_view_widget.setWindowTitle(str(import_videos_path))
+
+ self._tree_view_widget.doubleClicked.connect(self._open_file)
+
+
+ def _open_file(self):
+ index = self._tree_view_widget.currentIndex()
+ file_path = self._file_system_model.filePath(index)
+ logger.info(f"Opening file from file_system_view_widget: {file_path}")
+ open_file(file_path)
+ def _create_video_file_list_widget(self):
+
+
+ list_view = QListWidget()
+ list_view.setWordWrap(True)
+ if len(self._video_file_paths) == 0:
+ list_view.addItem(no_files_found_string)
+ else:
+ list_view.addItems(self._video_file_paths)
+ return list_view
+
+ def _handle_folder_name_line_edit_changed(self, event):
+ self._folder_name = self._folder_name_line_edit.text()
+ self._folder_where_videos_will_be_saved_to_label.setText(self._get_folder_videos_will_be_saved_to())
+
+ def _handle_continue_button_clicked(self, event):
+ self.folder_to_save_videos_to_selected.emit(
+ self._video_file_paths,
+ self._get_folder_videos_will_be_saved_to())
+ self.accept()
+
+if __name__ == "__main__":
+ # from PyQt6.QtWidgets import QApplication
+ # import sys
+ #
+ # app = QApplication(sys.argv)
+ import_videos_window = ImportVideosWizard(import_videos_path=Path().home())
+ import_videos_window.exec()
+ # import_videos_window.show()
+ # sys.exit(app.exec())
+
diff --git a/freemocap/gui/qt/widgets/jupyter_console_widget.py b/freemocap/gui/qt/widgets/jupyter_console_widget.py
new file mode 100644
index 00000000..7cb02ca4
--- /dev/null
+++ b/freemocap/gui/qt/widgets/jupyter_console_widget.py
@@ -0,0 +1,99 @@
+import logging
+
+from PyQt6.QtWidgets import QVBoxLayout, QWidget
+from qtconsole.manager import QtKernelManager
+from qtconsole.rich_jupyter_widget import RichJupyterWidget
+
+logger = logging.getLogger(__name__)
+
+
+class JupyterConsoleWidget(QWidget):
+ def __init__(self, dark_mode: bool = True, parent=None):
+ super().__init__(parent=parent)
+
+ self._layout = QVBoxLayout()
+ self.setLayout(self._layout)
+
+ self._kernel_manager = QtKernelManager(kernel_name="python3")
+ self._kernel_manager.start_kernel()
+
+ self._kernel_client = self._kernel_manager.client()
+ self._kernel_client.start_channels()
+
+ self._jupyter_widget = RichJupyterWidget()
+ self._jupyter_widget.kernel_manager = self._kernel_manager
+ self._jupyter_widget.kernel_client = self._kernel_client
+
+ self._layout.addWidget(self._jupyter_widget)
+
+ self._import_stuff()
+
+ self._connect_to_logging()
+
+ # get_qt_app().aboutToQuit.connect(self.shutdown_kernel)
+
+ if dark_mode:
+ self._jupyter_widget.set_default_style("linux")
+
+ @property
+ def jupyter_widget(self):
+ return self._jupyter_widget
+
+ def _start_kernel_and_whatnot(self):
+ """Start a kernel, connect to it, and create a RichJupyterWidget to use it"""
+ kernel_manager = QtKernelManager(kernel_name="python3")
+ kernel_manager.start_kernel()
+
+ kernel_client = kernel_manager.client()
+ kernel_client.start_channels()
+
+ jupyter_widget = RichJupyterWidget()
+ jupyter_widget.kernel_manager = kernel_manager
+ jupyter_widget.kernel_client = kernel_client
+ return jupyter_widget
+
+ def _import_stuff(self):
+ self.execute("import matplotlib.pyplot as plt", hidden=True)
+ self.execute("import numpy as np", hidden=True)
+ self.execute("%whos")
+
+ def execute(self, code: str, hidden: bool = False):
+ self._jupyter_widget.execute(code, hidden=hidden)
+
+ def print_to_console(self, message: str):
+ self.execute(f"print('{message}')")
+
+ def write(self, text: str):
+ self._jupyter_widget._append_plain_text(text)
+
+ def shutdown_kernel(self):
+ self._jupyter_widget.kernel_client.stop_channels()
+ self._jupyter_widget.kernel_manager.shutdown_kernel()
+
+ def _connect_to_logging(self):
+ return
+ # logger.info("Connecting Jupyter Console Widget to Logging")
+ # logging.getLogger("").handlers.append(logging.StreamHandler(self))
+
+
+if __name__ == "__main__":
+ from freemocap.system.logging.configure_logging import configure_logging
+
+ configure_logging()
+ logger.info("Hello world!")
+
+ from PyQt6.QtWidgets import QApplication
+
+ app = QApplication([])
+
+ jupyter_widget = JupyterConsoleWidget()
+ jupyter_widget.show()
+
+ h = logging.StreamHandler(jupyter_widget)
+ logging.getLogger("").handlers.append(h)
+ logger.info("Hello world worldddd!")
+ logger.info("Hello world worlddd WWWWWEEEEEEE!")
+
+ logger.info("gfsdgdfg!")
+ logger.info("gfsdgdfsdfsdfsg!")
+ app.exec()
diff --git a/freemocap/gui/qt/widgets/log_view_widget.py b/freemocap/gui/qt/widgets/log_view_widget.py
new file mode 100644
index 00000000..92f76c06
--- /dev/null
+++ b/freemocap/gui/qt/widgets/log_view_widget.py
@@ -0,0 +1,85 @@
+import logging
+import multiprocessing
+import threading
+from logging.handlers import QueueHandler
+from queue import Queue
+
+from PyQt6 import QtCore
+from PyQt6.QtCore import QThread
+from PyQt6.QtWidgets import QApplication, QPlainTextEdit
+
+logger = logging.getLogger(__name__)
+
+log_view_logging_format_string = (
+ "[%(asctime)s.%(msecs)04d] [%(levelname)4s] [%(name)s:%(funcName)s():%(lineno)s]\n :::::: %(message)s\n."
+)
+
+log_view_logging_formatter = logging.Formatter(fmt=log_view_logging_format_string, datefmt="%Y-%m-%dT%H:%M:%S")
+
+
+class LoggingQueueListener(QThread):
+ log_message_signal = QtCore.pyqtSignal(str)
+
+ def __init__(self, logging_queue: Queue, exit_event: threading.Event, parent=None):
+ super().__init__(parent)
+ self._logging_queue = logging_queue
+ self._exit_event = exit_event
+
+ def run(self):
+ logger.info("Starting LoggingQueueListener thread")
+ try:
+ while not self._exit_event.is_set():
+ if self._logging_queue.empty():
+ continue
+
+ record = self._logging_queue.get(block=True)
+
+ if record is None:
+ break
+ self.log_message_signal.emit(record.message)
+ except Exception as e:
+
+ self.close()
+
+ def close(self):
+ logger.info("Closing LoggingQueueListener thread")
+ self._exit_event.set()
+
+
+class LogViewWidget(QPlainTextEdit):
+ # adapted from - https://stackoverflow.com/a/63853259/14662833
+ def __init__(self, parent=None):
+ super().__init__(parent)
+ self.setReadOnly(True)
+
+ self._logging_queue = multiprocessing.Queue(-1)
+ self._queue_handler = QueueHandler(self._logging_queue)
+ self._queue_handler.setFormatter(log_view_logging_formatter)
+ logging.getLogger("").handlers.append(self._queue_handler)
+
+ self._exit_event = threading.Event()
+ self._logging_queue_listener = LoggingQueueListener(
+ logging_queue=self._logging_queue, exit_event=self._exit_event
+ )
+ self._logging_queue_listener.log_message_signal.connect(self.add_log)
+
+ self._logging_queue_listener.start()
+
+ def add_log(self, message):
+ self.appendPlainText(message.rstrip())
+
+ def closeEvent(self, event):
+ logger.info("Closing LogViewWidget")
+ self._exit_event.set()
+ self._logging_queue_listener.close()
+ logging.getLogger("").handlers.remove(self._queue_handler)
+ super().closeEvent(event)
+
+
+if __name__ == "__main__":
+ import sys
+
+ app = QApplication(sys.argv)
+ log_view_widget = LogViewWidget()
+ log_view_widget.show()
+ sys.exit(app.exec())
diff --git a/freemocap/gui/qt/widgets/welcome_panel_widget.py b/freemocap/gui/qt/widgets/welcome_panel_widget.py
new file mode 100644
index 00000000..8e5cd63c
--- /dev/null
+++ b/freemocap/gui/qt/widgets/welcome_panel_widget.py
@@ -0,0 +1,115 @@
+import logging
+
+from PyQt6.QtCore import Qt
+from PyQt6.QtGui import QPixmap
+from PyQt6.QtWidgets import (
+ QCheckBox,
+ QLabel,
+ QPushButton,
+ QVBoxLayout,
+ QWidget,
+)
+
+from freemocap.system.paths_and_files_names import PATH_TO_FREEMOCAP_LOGO_SVG, SPARKLES_EMOJI_STRING
+from freemocap.gui.qt.actions_and_menus.actions import (
+ CREATE_NEW_RECORDING_ACTION_NAME,
+ LOAD_MOST_RECENT_RECORDING_ACTION_NAME,
+ LOAD_EXISTING_RECORDING_ACTION_NAME,
+ IMPORT_VIDEOS_ACTION_NAME,
+ REBOOT_GUI_ACTION_NAME,
+ EXIT_ACTION_NAME,
+ Actions,
+ KILL_THREADS_AND_PROCESSES_ACTION_NAME,
+)
+
+logger = logging.getLogger(__name__)
+
+
+class WelcomeScreenButton(QPushButton):
+ def __init__(self, text: str, parent: QWidget = None):
+ super().__init__(text, parent=parent)
+ self.setFixedHeight(50)
+ self.setFixedWidth(400)
+
+
+class WelcomeToFreemocapPanel(QWidget):
+ def __init__(self, actions: Actions, parent: QWidget = None):
+ super().__init__(parent=parent)
+
+ self._layout = QVBoxLayout()
+ self.setLayout(self._layout)
+
+ self.sizePolicy().setHorizontalStretch(1)
+ self.sizePolicy().setVerticalStretch(1)
+
+ self._add_freemocap_logo()
+
+ self._welcome_to_freemocap_title_widget = self._welcome_to_freemocap_title()
+ self._layout.addWidget(self._welcome_to_freemocap_title_widget)
+
+ self._create_new_session_button = WelcomeScreenButton(
+ f"{CREATE_NEW_RECORDING_ACTION_NAME} (Ctrl+N) {SPARKLES_EMOJI_STRING}"
+ )
+ self._create_new_session_button.clicked.connect(actions.create_new_recording_action.trigger)
+ self._layout.addWidget(self._create_new_session_button, alignment=Qt.AlignmentFlag.AlignCenter)
+ self._create_new_session_button.setProperty("recommended_next", True)
+
+ self._load_most_recent_session_button = WelcomeScreenButton(
+ f"{LOAD_MOST_RECENT_RECORDING_ACTION_NAME} (Ctrl+D)"
+ )
+ self._load_most_recent_session_button.clicked.connect(actions.load_most_recent_recording_action.trigger)
+ self._layout.addWidget(self._load_most_recent_session_button, alignment=Qt.AlignmentFlag.AlignCenter)
+
+ self._load_existing_session_button = WelcomeScreenButton(f"{LOAD_EXISTING_RECORDING_ACTION_NAME} (Ctrl+O)")
+ self._load_existing_session_button.clicked.connect(actions.load_most_recent_recording_action.trigger)
+ self._layout.addWidget(self._load_existing_session_button, alignment=Qt.AlignmentFlag.AlignCenter)
+
+ self._import_videos_button = WelcomeScreenButton(f"{IMPORT_VIDEOS_ACTION_NAME} (Ctrl+I)")
+ self._import_videos_button.clicked.connect(actions.import_videos_action.trigger)
+ self._layout.addWidget(self._import_videos_button, alignment=Qt.AlignmentFlag.AlignCenter)
+
+ # self._kill_threads_and_processes_button = WelcomeScreenButton(
+ # f"{KILL_THREADS_AND_PROCESSES_ACTION_NAME} (Ctrl+K)"
+ # )
+ # self._kill_threads_and_processes_button.clicked.connect(
+ # actions.kill_running_threads_and_processes_action.trigger
+ # )
+ # self._layout.addWidget(self._kill_threads_and_processes_button, alignment=Qt.AlignmentFlag.AlignCenter)
+ # self._kill_threads_and_processes_button.setProperty("secondary_button", True)
+ #
+ # self._reboot_gui_button = WelcomeScreenButton(f"{REBOOT_GUI_ACTION_NAME} (Ctrl+R)")
+ # self._reboot_gui_button.clicked.connect(actions.reboot_gui_action.trigger)
+ # self._layout.addWidget(self._reboot_gui_button, alignment=Qt.AlignmentFlag.AlignCenter)
+ # self._reboot_gui_button.setProperty("secondary_button", True)
+ #
+ # self._exit_button = WelcomeScreenButton(f"{EXIT_ACTION_NAME} (Ctrl+Q)")
+ # self._exit_button.clicked.connect(actions.exit_action.trigger)
+ # self._layout.addWidget(self._exit_button, alignment=Qt.AlignmentFlag.AlignCenter)
+ # self._exit_button.setProperty("secondary_button", True)
+
+ send_pings_string = "Send ping to devs to let us know when you make a new session (being able to show that people are using this thing will help us get funding for this project :D )"
+ self._send_pings_checkbox = QCheckBox(send_pings_string)
+ self._send_pings_checkbox.setChecked(True)
+ self._layout.addWidget(self._send_pings_checkbox)
+
+ self.style().polish(self)
+
+ def _welcome_to_freemocap_title(self):
+ # TO DO - this shouldn't be part of the `camera_view_panel` - it should be its own thing that gets swapped out on session start
+ logger.info("Creating `welcome to freemocap` layout")
+
+ session_title_label = QLabel("Welcome to FreeMoCap!")
+ session_title_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
+ session_title_label.setStyleSheet("font-size: 54px;")
+
+ return session_title_label
+
+ def _add_freemocap_logo(self):
+ freemocap_logo_label = QLabel(self)
+ freemocap_logo_label.sizePolicy().setHorizontalStretch(1)
+ freemocap_logo_label.sizePolicy().setVerticalStretch(1)
+ self._layout.addWidget(freemocap_logo_label)
+ freemocap_logo_pixmap = QPixmap(PATH_TO_FREEMOCAP_LOGO_SVG)
+ freemocap_logo_pixmap = freemocap_logo_pixmap.scaledToWidth(200)
+ freemocap_logo_label.setPixmap(freemocap_logo_pixmap)
+ freemocap_logo_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
diff --git a/src/core_processes/mediapipe_stuff/__init__.py b/freemocap/gui/qt/workers/__init__.py
similarity index 100%
rename from src/core_processes/mediapipe_stuff/__init__.py
rename to freemocap/gui/qt/workers/__init__.py
diff --git a/freemocap/gui/qt/workers/anipose_calibration_thread_worker.py b/freemocap/gui/qt/workers/anipose_calibration_thread_worker.py
new file mode 100644
index 00000000..89c7117a
--- /dev/null
+++ b/freemocap/gui/qt/workers/anipose_calibration_thread_worker.py
@@ -0,0 +1,72 @@
+import asyncio
+import logging
+import threading
+from pathlib import Path
+from typing import Union
+
+from PyQt6.QtCore import pyqtSignal, QThread
+
+from freemocap.core_processes.capture_volume_calibration.charuco_stuff.charuco_board_definition import (
+ CharucoBoardDefinition,
+)
+from freemocap.core_processes.capture_volume_calibration.run_anipose_capture_volume_calibration import (
+ run_anipose_capture_volume_calibration,
+)
+
+logger = logging.getLogger(__name__)
+
+
+class AniposeCalibrationThreadWorker(QThread):
+ finished = pyqtSignal()
+ in_progress = pyqtSignal(str)
+
+ def __init__(
+ self,
+ calibration_videos_folder_path: Union[str, Path],
+ charuco_square_size: Union[int, float],
+ kill_thread_event: threading.Event,
+ charuco_board_definition: CharucoBoardDefinition = CharucoBoardDefinition(),
+ ):
+ super().__init__()
+ logger.info(
+ f"Initializing Anipose Calibration Thread Worker for videos in path {calibration_videos_folder_path}"
+ )
+ self._kill_thread_event = kill_thread_event
+ self._charuco_board_definition = charuco_board_definition
+ self._charuco_square_size = charuco_square_size
+ self._calibration_videos_folder_path = calibration_videos_folder_path
+
+ self._work_done = False
+
+ @property
+ def work_done(self):
+ return self._work_done
+
+ def _emit_in_progress_data(self, message: str):
+ self.in_progress.emit(message)
+
+ def run(self):
+ logger.info("Beginning Anipose calibration with Charuco Square Size (mm): {}".format(self._charuco_square_size))
+
+ try:
+
+
+ run_anipose_capture_volume_calibration(
+ charuco_board_definition=self._charuco_board_definition,
+ charuco_square_size=self._charuco_square_size,
+ calibration_videos_folder_path=self._calibration_videos_folder_path,
+ pin_camera_0_to_origin=True,
+ progress_callback=self._emit_in_progress_data,
+ )
+
+
+
+ except Exception as e:
+ logger.exception("something went wrong in the anipose calibration")
+ logger.exception(e)
+
+ self.finished.emit()
+ self._work_done = True
+
+ logger.info("Anipose Calibration Complete")
+
diff --git a/freemocap/gui/qt/workers/process_motion_capture_data_thread_worker.py b/freemocap/gui/qt/workers/process_motion_capture_data_thread_worker.py
new file mode 100644
index 00000000..1115af30
--- /dev/null
+++ b/freemocap/gui/qt/workers/process_motion_capture_data_thread_worker.py
@@ -0,0 +1,49 @@
+import logging
+import multiprocessing
+
+from PyQt6.QtCore import pyqtSignal, QThread
+
+from freemocap.core_processes.process_motion_capture_videos.process_recording_folder import (
+ process_recording_folder,
+)
+from freemocap.parameter_info_models.recording_processing_parameter_models import RecordingProcessingParameterModel
+
+logger = logging.getLogger(__name__)
+
+
+class ProcessMotionCaptureDataThreadWorker(QThread):
+ finished = pyqtSignal()
+ in_progress = pyqtSignal(str)
+
+ def __init__(self, session_processing_parameters: RecordingProcessingParameterModel,
+ kill_event: multiprocessing.Event, parent=None):
+ super().__init__()
+ self._session_processing_parameters = session_processing_parameters
+ self._kill_event = kill_event
+
+
+ @property
+ def work_done(self):
+ return self._work_done
+
+ def _emit_in_progress_data(self, message: str):
+ self.in_progress.emit(message)
+
+ def run(self):
+ logger.info(
+ f"Beginning processing of motion capture data with parameters: {self._session_processing_parameters.__dict__}"
+ )
+ self._kill_event.clear()
+
+ process_recording_folder(
+ recording_processing_parameter_model=self._session_processing_parameters,
+ kill_event=self._kill_event,
+ )
+
+ logger.info("Finished processing session folder!")
+
+ self.finished.emit()
+ self._work_done = True
+
+ def kill(self):
+ self.terminate()
diff --git a/src/core_processes/post_process_skeleton_data/__init__.py b/freemocap/parameter_info_models/__init__.py
similarity index 100%
rename from src/core_processes/post_process_skeleton_data/__init__.py
rename to freemocap/parameter_info_models/__init__.py
diff --git a/freemocap/parameter_info_models/recording_info_model.py b/freemocap/parameter_info_models/recording_info_model.py
new file mode 100644
index 00000000..304a2d9c
--- /dev/null
+++ b/freemocap/parameter_info_models/recording_info_model.py
@@ -0,0 +1,202 @@
+import logging
+from pathlib import Path
+from typing import Union, Dict
+
+from freemocap.system.paths_and_files_names import (
+ CENTER_OF_MASS_FOLDER_NAME,
+ MEDIAPIPE_2D_NPY_FILE_NAME,
+ RAW_MEDIAPIPE_3D_NPY_FILE_NAME,
+ OUTPUT_DATA_FOLDER_NAME,
+ RAW_DATA_FOLDER_NAME,
+ TOTAL_BODY_CENTER_OF_MASS_NPY_FILE_NAME,
+ MEDIAPIPE_REPROJECTION_ERROR_NPY_FILE_NAME,
+ SYNCHRONIZED_VIDEOS_FOLDER_NAME,
+ get_blender_file_path,
+ get_last_successful_calibration_toml_path,
+ ANNOTATED_VIDEOS_FOLDER_NAME,
+ MEDIAPIPE_3D_NPY_FILE_NAME, create_camera_calibration_file_name,
+)
+from freemocap.tests.test_mediapipe_2d_data_shape import test_mediapipe_2d_data_shape
+from freemocap.tests.test_mediapipe_3d_data_shape import test_mediapipe_3d_data_shape
+from freemocap.tests.test_synchronized_video_frame_counts import (
+ test_synchronized_video_frame_counts,
+)
+from freemocap.tests.test_total_body_center_of_mass_data_shape import (
+ test_total_body_center_of_mass_data_shape,
+)
+
+logger = logging.getLogger(__name__)
+
+
+class RecordingInfoModel:
+ def __init__(
+ self,
+ recording_folder_path: Union[Path, str],
+ ):
+ if any([Path(recording_folder_path).name == SYNCHRONIZED_VIDEOS_FOLDER_NAME,
+ Path(recording_folder_path).name == ANNOTATED_VIDEOS_FOLDER_NAME,
+ Path(recording_folder_path).name == OUTPUT_DATA_FOLDER_NAME]):
+ recording_folder_path = Path(recording_folder_path).parent
+
+ self._path = Path(recording_folder_path)
+ self._name = self._path.name
+
+ self._calibration_toml_path = str(
+ Path(self._path) / create_camera_calibration_file_name(recording_name=self._name))
+
+ self._recording_folder_status_checker = RecordingFolderStatusChecker(recording_info_model=self)
+
+ @property
+ def path(self) -> str:
+ return str(self._path)
+
+ @property
+ def name(self) -> str:
+ return self._name
+
+ @property
+ def status_check(self) -> Dict[str, bool]:
+ return self._recording_folder_status_checker.status_check
+
+ @property
+ def calibration_toml_path(self) -> str:
+ return self._calibration_toml_path
+ @calibration_toml_path.setter
+ def calibration_toml_path(self, path: Union[Path, str]):
+ self._calibration_toml_path = str(path)
+
+ @property
+ def output_data_folder_path(self) -> str:
+ return str(Path(self._path) / OUTPUT_DATA_FOLDER_NAME)
+
+ @property
+ def raw_data_folder_path(self) -> str:
+ return str(Path(self.output_data_folder_path) / RAW_DATA_FOLDER_NAME)
+
+ @property
+ def synchronized_videos_folder_path(self) -> str:
+ return str(Path(self._path) / SYNCHRONIZED_VIDEOS_FOLDER_NAME)
+
+ @property
+ def annotated_videos_folder_path(self) -> str:
+ return str(Path(self._path) / ANNOTATED_VIDEOS_FOLDER_NAME)
+
+ @property
+ def mediapipe_2d_data_npy_file_path(self):
+ return str(Path(self._path) / OUTPUT_DATA_FOLDER_NAME / RAW_DATA_FOLDER_NAME / MEDIAPIPE_2D_NPY_FILE_NAME)
+
+ @property
+ def mediapipe_3d_data_npy_file_path(self):
+ return str(Path(self._path) / OUTPUT_DATA_FOLDER_NAME / MEDIAPIPE_3D_NPY_FILE_NAME)
+
+ @property
+ def raw_mediapipe_3d_data_npy_file_path(self):
+ return str(Path(self._path) / OUTPUT_DATA_FOLDER_NAME / RAW_DATA_FOLDER_NAME / RAW_MEDIAPIPE_3D_NPY_FILE_NAME)
+
+ @property
+ def mediapipe_reprojection_error_data_npy_file_path(self):
+ return str(
+ Path(self._path)
+ / OUTPUT_DATA_FOLDER_NAME
+ / RAW_DATA_FOLDER_NAME
+ / MEDIAPIPE_REPROJECTION_ERROR_NPY_FILE_NAME
+ )
+
+ @property
+ def total_body_center_of_mass_npy_file_path(self):
+ return str(
+ Path(self._path)
+ / OUTPUT_DATA_FOLDER_NAME
+ / CENTER_OF_MASS_FOLDER_NAME
+ / TOTAL_BODY_CENTER_OF_MASS_NPY_FILE_NAME
+ )
+
+ @property
+ def blender_file_path(self):
+ return get_blender_file_path(str(self._path))
+
+ @property
+ def blender_file_status_check(self):
+ return Path(self.blender_file_path).is_file()
+
+ @property
+ def calibration_toml_check(self) -> bool:
+ return self._recording_folder_status_checker.check_calibration_toml_status()
+
+ @property
+ def synchronized_videos_status_check(self) -> bool:
+ return self._recording_folder_status_checker.check_synchronized_videos_status()
+
+ @property
+ def data2d_status_check(self) -> bool:
+ return self._recording_folder_status_checker.check_data2d_status()
+
+ @property
+ def data3d_status_check(self) -> bool:
+ return self._recording_folder_status_checker.check_data3d_status()
+
+ @property
+ def center_of_mass_data_status_check(self) -> bool:
+ return self._recording_folder_status_checker.check_center_of_mass_data_status()
+
+
+class RecordingFolderStatusChecker:
+ def __init__(self, recording_info_model: RecordingInfoModel):
+
+ self.recording_info_model = recording_info_model
+
+ @property
+ def status_check(self) -> Dict[str, bool]:
+ return {
+ 'synchronized_videos_status_check': self.check_synchronized_videos_status(),
+ 'data2d_status_check': self.check_data2d_status(),
+ 'data3d_status_check': self.check_data3d_status(),
+ 'center_of_mass_data_status_check': self.check_center_of_mass_data_status(),
+ 'blender_file_status_check': self.check_blender_file_status(), }
+
+ def check_synchronized_videos_status(self) -> bool:
+ try:
+ test_synchronized_video_frame_counts(self.recording_info_model.synchronized_videos_folder_path)
+ return True
+ except AssertionError:
+ return False
+
+ def check_data2d_status(self) -> bool:
+
+ try:
+ test_mediapipe_2d_data_shape(
+ synchronized_videos_folder=self.recording_info_model.synchronized_videos_folder_path,
+ mediapipe_2d_data_file_path=self.recording_info_model.mediapipe_2d_data_npy_file_path,
+ )
+
+ return True
+ except AssertionError as e:
+ return False
+
+ def check_data3d_status(self) -> bool:
+ try:
+ test_mediapipe_3d_data_shape(
+ synchronized_videos_folder=self.recording_info_model.synchronized_videos_folder_path,
+ mediapipe_3d_data_npy_path=self.recording_info_model.mediapipe_3d_data_npy_file_path,
+ medipipe_reprojection_error_data_npy_path=self.recording_info_model.mediapipe_reprojection_error_data_npy_file_path,
+ )
+ return True
+ except AssertionError as e:
+
+ return False
+
+ def check_center_of_mass_data_status(self) -> bool:
+ try:
+ test_total_body_center_of_mass_data_shape(
+ synchronized_videos_folder=self.recording_info_model.synchronized_videos_folder_path,
+ total_body_center_of_mass_npy_file_path=self.recording_info_model.total_body_center_of_mass_npy_file_path,
+ )
+ return True
+ except AssertionError as e:
+ return False
+
+ def check_blender_file_status(self) -> bool:
+ return Path(self.recording_info_model.blender_file_path).is_file()
+
+ def check_calibration_toml_status(self) -> bool:
+ return Path(self.recording_info_model.calibration_toml_path).is_file()
diff --git a/freemocap/parameter_info_models/recording_processing_parameter_models.py b/freemocap/parameter_info_models/recording_processing_parameter_models.py
new file mode 100644
index 00000000..5882350c
--- /dev/null
+++ b/freemocap/parameter_info_models/recording_processing_parameter_models.py
@@ -0,0 +1,43 @@
+import logging
+
+from pydantic import BaseModel
+
+from freemocap.parameter_info_models.recording_info_model import (
+ RecordingInfoModel,
+)
+
+logger = logging.getLogger(__name__)
+
+
+class MediapipeParametersModel(BaseModel):
+ model_complexity: int = 2
+ min_detection_confidence: float = 0.5
+ min_tracking_confidence: float = 0.5
+ static_image_mode: bool = False
+
+
+class AniposeTriangulate3DParametersModel(BaseModel):
+ confidence_threshold_cutoff: float = 0.7
+ use_triangulate_ransac_method: bool = False
+
+
+class ButterworthFilterParametersModel(BaseModel):
+ sampling_rate: float = 30
+ cutoff_frequency: float = 7
+ order: int = 4
+
+
+class PostProcessingParametersModel(BaseModel):
+ framerate: float = 30.0
+ butterworth_filter_parameters = ButterworthFilterParametersModel()
+ max_gap_to_fill: int = 10
+
+
+class RecordingProcessingParameterModel(BaseModel):
+ recording_info_model: RecordingInfoModel = None
+ mediapipe_parameters_model: MediapipeParametersModel = MediapipeParametersModel()
+ anipose_triangulate_3d_parameters_model: AniposeTriangulate3DParametersModel = AniposeTriangulate3DParametersModel()
+ post_processing_parameters_model: PostProcessingParametersModel = PostProcessingParametersModel()
+
+ class Config:
+ arbitrary_types_allowed = True
diff --git a/src/diagnostic_plot_makers/__init__.py b/freemocap/system/__init__.py
similarity index 100%
rename from src/diagnostic_plot_makers/__init__.py
rename to freemocap/system/__init__.py
diff --git a/freemocap/system/logging/configure_logging.py b/freemocap/system/logging/configure_logging.py
new file mode 100644
index 00000000..6e390975
--- /dev/null
+++ b/freemocap/system/logging/configure_logging.py
@@ -0,0 +1,45 @@
+import logging
+import logging.handlers
+import sys
+from logging.config import dictConfig
+
+from freemocap.system.paths_and_files_names import get_log_file_path
+
+DEFAULT_LOGGING = {"version": 1, "disable_existing_loggers": False}
+
+LOG_FILE_PATH = None
+
+format_string = "[%(asctime)s.%(msecs)04d] [%(levelname)8s] [%(name)s] [%(funcName)s():%(lineno)s] [PID:%(process)d TID:%(thread)d] %(message)s"
+
+default_logging_formatter = logging.Formatter(fmt=format_string, datefmt="%Y-%m-%d %H:%M:%S")
+
+
+def get_logging_handlers():
+ dictConfig(DEFAULT_LOGGING)
+
+ console_handler = logging.StreamHandler(sys.stdout)
+ console_handler.setLevel(logging.DEBUG)
+ console_handler.setFormatter(default_logging_formatter)
+
+ # Setup File handler (from https://stackoverflow.com/a/24507130/14662833 )
+
+ file_handler = logging.FileHandler(get_log_file_path())
+ file_handler.setFormatter(default_logging_formatter)
+ file_handler.setLevel(logging.DEBUG)
+
+ return [console_handler, file_handler]
+
+
+def configure_logging():
+ print(f"Setting up freemocap logging {__file__}")
+
+ if len(logging.getLogger().handlers) == 0:
+ handlers = get_logging_handlers()
+ for handler in handlers:
+ if not handler in logging.getLogger("").handlers:
+ logging.getLogger("").handlers.append(handler)
+
+ logging.root.setLevel(logging.DEBUG)
+ else:
+ logger = logging.getLogger(__name__)
+ logger.info("Logging already configured")
diff --git a/freemocap/system/paths_and_files_names.py b/freemocap/system/paths_and_files_names.py
new file mode 100644
index 00000000..c600197f
--- /dev/null
+++ b/freemocap/system/paths_and_files_names.py
@@ -0,0 +1,221 @@
+import time
+from datetime import datetime
+from pathlib import Path
+from typing import Union
+
+import toml
+
+import freemocap
+import logging
+
+logger = logging.getLogger(__name__)
+
+# directory names
+BASE_FREEMOCAP_DATA_FOLDER_NAME = "freemocap_data"
+RECORDING_SESSIONS_FOLDER_NAME = "recording_sessions"
+CALIBRATIONS_FOLDER_NAME = "calibrations"
+LOGS_INFO_AND_SETTINGS_FOLDER_NAME = "logs_info_and_settings"
+LOG_FILE_FOLDER_NAME = "logs"
+OUTPUT_DATA_FOLDER_NAME = "output_data"
+SYNCHRONIZED_VIDEOS_FOLDER_NAME = "synchronized_videos"
+ANNOTATED_VIDEOS_FOLDER_NAME = "annotated_videos"
+RAW_DATA_FOLDER_NAME = "raw_data"
+CENTER_OF_MASS_FOLDER_NAME = "center_of_mass"
+
+# file names
+MOST_RECENT_RECORDING_TOML_FILENAME = "most_recent_recording.toml"
+LAST_SUCCESSFUL_CALIBRATION_TOML_FILENAME = "last_successful_calibration.toml"
+MEDIAPIPE_2D_NPY_FILE_NAME = "mediapipe2dData_numCams_numFrames_numTrackedPoints_pixelXY.npy"
+MEDIAPIPE_3D_NPY_FILE_NAME = "mediaPipeSkel_3d_body_hands_face.npy"
+RAW_MEDIAPIPE_3D_NPY_FILE_NAME = "mediapipe3dData_numFrames_numTrackedPoints_spatialXYZ.npy"
+MEDIAPIPE_REPROJECTION_ERROR_NPY_FILE_NAME = "mediapipe3dData_numFrames_numTrackedPoints_reprojectionError.npy"
+MEDIAPIPE_BODY_3D_DATAFRAME_CSV_FILE_NAME = "mediapipe_body_3d_xyz.csv"
+
+SEGMENT_CENTER_OF_MASS_NPY_FILE_NAME = "segmentCOM_frame_joint_xyz.npy"
+
+TOTAL_BODY_CENTER_OF_MASS_NPY_FILE_NAME = "total_body_center_of_mass_xyz.npy"
+
+# logo
+PATH_TO_FREEMOCAP_LOGO_SVG = str(Path(freemocap.__file__).parent.parent / "assets/logo/freemocap-logo-black-border.svg")
+
+# emoji strings
+SPARKLES_EMOJI_STRING = "\U00002728"
+DIZZY_EMOJI_STRING = "\U0001F4AB"
+EYES_EMOJI_STRING = "\U0001F440"
+SKULL_EMOJI_STRING = "\U0001F480"
+CAMERA_WITH_FLASH_EMOJI_STRING = "\U0001F4F8"
+HAMMER_AND_WRENCH_EMOJI_STRING = "\U0001F6E0"
+ROBOT_EMOJI_STRING = "\U0001F916"
+THREE_HEARTS_EMOJI_STRING = "\U0001F495"
+WIND_EMOJI_STRING = "\U0001F32C"
+GEAR_EMOJI_STRING = "\U00002699"
+FOLDER_EMOJI_STRING = "\U0001F4C1"
+DIRECTORY_EMOJI_STRING = "\U0001F4C1"
+COOL_EMOJI_STRING = "\U0001F60E"
+
+
+def os_independent_home_dir():
+ return str(Path.home())
+
+
+def get_log_file_path():
+ log_folder_path = Path(get_freemocap_data_folder_path()) / LOGS_INFO_AND_SETTINGS_FOLDER_NAME / LOG_FILE_FOLDER_NAME
+ log_folder_path.mkdir(exist_ok=True, parents=True)
+ log_file_path = log_folder_path / create_log_file_name()
+ return str(log_file_path)
+
+
+def create_log_file_name():
+ return "log_" + time.strftime("%m-%d-%Y-%H_%M_%S") + ".log"
+
+
+def create_camera_calibration_file_name(recording_name: str):
+ return f"{recording_name}_camera_calibration.toml"
+
+
+freemocap_data_folder_path = None
+def get_freemocap_data_folder_path(create_folder: bool = True):
+ global freemocap_data_folder_path
+
+ if freemocap_data_folder_path is None:
+ freemocap_data_folder_path = Path(os_independent_home_dir(), BASE_FREEMOCAP_DATA_FOLDER_NAME)
+
+ if create_folder:
+ freemocap_data_folder_path.mkdir(exist_ok=create_folder, parents=True)
+
+ return str(freemocap_data_folder_path)
+
+
+def get_calibrations_folder_path(create_folder: bool = True):
+ calibration_folder_path = Path(get_freemocap_data_folder_path()) / CALIBRATIONS_FOLDER_NAME
+
+ if create_folder:
+ calibration_folder_path.mkdir(exist_ok=create_folder, parents=True)
+
+ return str(calibration_folder_path)
+
+
+def create_new_recording_folder_path(recording_name: str):
+
+ recording_folder_path = Path(create_new_session_folder()) / recording_name
+
+ return str(recording_folder_path)
+
+
+def get_gmt_offset_string():
+ # from - https://stackoverflow.com/a/53860920/14662833
+ gmt_offset_int = int(time.localtime().tm_gmtoff / 60 / 60)
+ return f"{gmt_offset_int:+}"
+
+
+def get_iso6201_time_string(timespec: str = "milliseconds", make_filename_friendly: bool = True):
+ iso6201_timestamp = datetime.now().isoformat(timespec=timespec)
+ gmt_offset_string = f"_gmt{get_gmt_offset_string()}"
+ iso6201_timestamp_w_gmt = iso6201_timestamp + gmt_offset_string
+ if make_filename_friendly:
+ iso6201_timestamp_w_gmt = iso6201_timestamp_w_gmt.replace(":", "_")
+ iso6201_timestamp_w_gmt = iso6201_timestamp_w_gmt.replace(".", "ms")
+ return iso6201_timestamp_w_gmt
+
+
+def create_new_default_recording_name():
+ full_time = get_iso6201_time_string(timespec="seconds")
+ just_hours_minutes_seconds = full_time.split("T")[1]
+ recording_name = "recording_" + just_hours_minutes_seconds
+ return recording_name
+
+
+def session_time_tag_format():
+ return "%Y-%m-%d_%H_%M_%S"
+def default_session_name(string_tag: str = None):
+ if string_tag is not None:
+ string_tag = f"_{string_tag}"
+ else:
+ string_tag = ""
+
+ session_name = time.strftime(f"session_{session_time_tag_format()}" + string_tag)
+ logger.debug(f"Creating default session name: {session_name}")
+
+ return session_name
+
+
+session_folder_path = None
+def create_new_session_folder():
+ global session_folder_path
+ if session_folder_path is None:
+ session_folder_path = Path(get_recording_session_folder_path()) / default_session_name()
+
+ return str(session_folder_path)
+
+
+def get_recording_session_folder_path(create_folder: bool = True):
+ recording_session_folder_path = Path(get_freemocap_data_folder_path()) / RECORDING_SESSIONS_FOLDER_NAME
+
+ if create_folder:
+ recording_session_folder_path.mkdir(exist_ok=create_folder, parents=True)
+
+ return str(recording_session_folder_path)
+
+
+def get_logs_info_and_settings_folder_path(create_folder: bool = True):
+ logs_info_and_settings_folder_path = Path(get_freemocap_data_folder_path()) / LOGS_INFO_AND_SETTINGS_FOLDER_NAME
+
+ if create_folder:
+ logs_info_and_settings_folder_path.mkdir(exist_ok=create_folder, parents=True)
+
+ return str(logs_info_and_settings_folder_path)
+
+
+def get_css_stylesheet_path():
+ # return str(Path(__file__).parent.parent / "gui" / "qt" / "style_sheet" / "ElegantDark.qss")
+ # return str(Path(__file__).parent.parent / "gui" / "qt" / "style_sheet" / "FunkyTown.qss")
+ return str(Path(__file__).parent.parent / "gui" / "qt" / "style_sheet" / "qt_style_sheet.css")
+
+
+def get_most_recent_recording_toml_path():
+ return str(Path(get_logs_info_and_settings_folder_path()) / MOST_RECENT_RECORDING_TOML_FILENAME)
+
+
+def get_most_recent_recording_path(subfolder_str: str = None):
+ if not Path(get_most_recent_recording_toml_path()).exists():
+ logger.error(f"{MOST_RECENT_RECORDING_TOML_FILENAME} not found at {get_most_recent_recording_toml_path()}!!")
+ return None
+
+ most_recent_recording_dict = toml.load(str(get_most_recent_recording_toml_path()))
+ most_recent_recording_path = most_recent_recording_dict["most_recent_recording_path"]
+
+ if not Path(most_recent_recording_path).exists():
+ logger.error(f"Most recent recording path {most_recent_recording_path} not found!!")
+ return None
+
+ if subfolder_str is not None:
+ try:
+ # check if folder is specified in toml file, otherwise return default
+ sub_folder_path = most_recent_recording_dict[subfolder_str]
+ except KeyError:
+ sub_folder_path = Path(most_recent_recording_path) / subfolder_str
+ return str(sub_folder_path)
+
+ else:
+
+ return str(most_recent_recording_path)
+
+
+def get_last_successful_calibration_toml_path():
+ return str(Path(get_logs_info_and_settings_folder_path()) / LAST_SUCCESSFUL_CALIBRATION_TOML_FILENAME)
+
+
+def get_last_successful_calibration_name():
+ path = get_last_successful_calibration_toml_path()
+ if not Path(path).exists():
+ logger.error(f"{LAST_SUCCESSFUL_CALIBRATION_TOML_FILENAME} not found at {path}!!")
+ return None
+ toml_dict = toml.load(path)
+
+
+def get_blender_file_name(recording_name: str):
+ return f"{recording_name}.blend"
+
+
+def get_blender_file_path(recording_folder_path: Union[Path,str]):
+ return str(Path(recording_folder_path) / get_blender_file_name(recording_name=Path(recording_folder_path).name))
diff --git a/freemocap/system/start_file.py b/freemocap/system/start_file.py
new file mode 100644
index 00000000..501dcebb
--- /dev/null
+++ b/freemocap/system/start_file.py
@@ -0,0 +1,9 @@
+import os, sys, subprocess
+
+
+def open_file(filename):
+ if sys.platform == "win32":
+ os.startfile(filename)
+ else:
+ opener = "open" if sys.platform == "darwin" else "xdg-open"
+ subprocess.call([opener, filename])
diff --git a/src/gui/__init__.py b/freemocap/system/user_data/__init__.py
similarity index 100%
rename from src/gui/__init__.py
rename to freemocap/system/user_data/__init__.py
diff --git a/freemocap/system/user_data/pipedream_pings.py b/freemocap/system/user_data/pipedream_pings.py
new file mode 100644
index 00000000..4e65fc58
--- /dev/null
+++ b/freemocap/system/user_data/pipedream_pings.py
@@ -0,0 +1,28 @@
+import logging
+import uuid
+import requests
+
+logger = logging.getLogger(__name__)
+
+
+class PipedreamPings:
+ def __init__(self, ):
+ self._pipedream_url = "https://eowipinr6rcpbo0.m.pipedream.net"
+ self._pings_dict = {}
+ self.update_pings_dict(key="session_uuid",
+ value=str(uuid.uuid4()))
+
+ def update_pings_dict(self, key, value):
+ self._pings_dict[key] = value
+
+ def send_pipedream_ping(self):
+ logger.info(
+ f"Sending anonymous ping to pipedream to let the devs know that someone is using this, which will allow "
+ f"us to secure more funding to support this project. This is the dictionary of info we're sending: \n "
+ f"{self._pings_dict} "
+ )
+
+ requests.post(
+ self._pipedream_url,
+ json=self._pings_dict,
+ )
diff --git a/freemocap/tests/test_mediapipe_2d_data_shape.py b/freemocap/tests/test_mediapipe_2d_data_shape.py
new file mode 100644
index 00000000..aff8e3b5
--- /dev/null
+++ b/freemocap/tests/test_mediapipe_2d_data_shape.py
@@ -0,0 +1,48 @@
+from pathlib import Path
+from typing import Union
+
+import numpy as np
+
+from freemocap.tests.utilities.get_number_of_frames_of_videos_in_a_folder import (
+ get_number_of_frames_of_videos_in_a_folder,
+)
+
+
+def test_mediapipe_2d_data_shape(
+ synchronized_videos_folder: Union[str, Path],
+ mediapipe_2d_data_file_path: Union[str, Path],
+):
+
+ """
+ test that the `mediapipe 2d detection` process worked correctly by checking:
+
+ 1. There is an `.npy` file containing the mediapipe 2d data in the `output_data_folder`
+ 2. The dimensions of that `npy` (number of cameras, number of frames, [ need to do - number of tracked points], [pixelX, pixelY] matches the videos in the `synchronized videos` folder
+
+ TODO - check number of tracked points vs 'expected' number of tracked points
+ """
+
+ assert Path(
+ mediapipe_2d_data_file_path
+ ).is_file(), f"{mediapipe_2d_data_file_path} is not a file"
+
+ mediapipe_2d_data = np.load(mediapipe_2d_data_file_path)
+
+ list_of_video_paths = list(Path(synchronized_videos_folder).glob("*.mp4"))
+ number_of_videos = len(list_of_video_paths)
+ assert mediapipe_2d_data.shape[0] == number_of_videos
+
+ frame_count = get_number_of_frames_of_videos_in_a_folder(synchronized_videos_folder)
+
+ assert (
+ len(set(frame_count)) == 1
+ ), f"Videos in {synchronized_videos_folder} have different frame counts: {frame_count}"
+ assert (
+ mediapipe_2d_data.shape[1] == frame_count[0]
+ ), f"Number of frames in {mediapipe_2d_data_file_path} does not match number of frames of videos in {synchronized_videos_folder}"
+
+ # TODO - check number of tracked points vs 'expected' number of tracked points
+
+ assert mediapipe_2d_data.shape[3] == 2
+
+ return True
diff --git a/freemocap/tests/test_mediapipe_3d_data_shape.py b/freemocap/tests/test_mediapipe_3d_data_shape.py
new file mode 100644
index 00000000..3983af61
--- /dev/null
+++ b/freemocap/tests/test_mediapipe_3d_data_shape.py
@@ -0,0 +1,63 @@
+from pathlib import Path
+from typing import Union
+
+import numpy as np
+
+from freemocap.tests.utilities.get_number_of_frames_of_videos_in_a_folder import (
+ get_number_of_frames_of_videos_in_a_folder,
+)
+
+
+def test_mediapipe_3d_data_shape(
+ synchronized_videos_folder: Union[str, Path],
+ mediapipe_3d_data_npy_path: Union[str, Path],
+ medipipe_reprojection_error_data_npy_path: Union[str, Path],
+):
+ """
+ test that the `mediapipe 3d detection` process worked correctly by checking:
+
+ 1. There is an `.npy` file containing the mediapipe 3d data in the `output_data_folder`
+ 2. The dimensions of that `npy` ( number of frames, [ need to do - number of tracked points], [X,Y,Z] matches the videos in the `synchronized videos` folder
+
+ TODO - check number of tracked points vs 'expected' number of tracked points
+ """
+
+ assert Path(
+ mediapipe_3d_data_npy_path
+ ).is_file(), f"3d skeleton data file does not exist at {mediapipe_3d_data_npy_path}"
+
+ skel3d_frame_marker_xyz = np.load(mediapipe_3d_data_npy_path)
+
+ assert (
+ len(skel3d_frame_marker_xyz.shape) == 3
+ ), f"3d skeleton data file should have 3 dimensions - {mediapipe_3d_data_npy_path}"
+
+ assert Path(
+ medipipe_reprojection_error_data_npy_path
+ ).is_file(), f"3d skeleton reprojection error data file does not exist at {medipipe_reprojection_error_data_npy_path}"
+
+ skeleton_reprojection_error_fr_mar = np.load(
+ medipipe_reprojection_error_data_npy_path
+ )
+
+ assert (
+ len(skeleton_reprojection_error_fr_mar.shape) == 2
+ ), f"3d skeleton reprojection error data file should have 2 dimensions {medipipe_reprojection_error_data_npy_path}"
+
+ frame_count = get_number_of_frames_of_videos_in_a_folder(synchronized_videos_folder)
+ assert (
+ len(set(frame_count)) == 1
+ ), f"Videos in {synchronized_videos_folder} have different frame counts: {frame_count}"
+
+ number_of_frames = frame_count[0]
+
+ assert skel3d_frame_marker_xyz.shape[0] == number_of_frames
+ assert skeleton_reprojection_error_fr_mar.shape[0] == number_of_frames
+
+ # TODO - check number of tracked points vs 'expected' number of tracked points
+
+ assert (
+ skel3d_frame_marker_xyz.shape[2] == 3
+ ), f"3d skeleton data file does not have 3 dimensions for X,Y,Z at {mediapipe_3d_data_npy_path}"
+
+ return True
diff --git a/freemocap/tests/test_synchronized_video_frame_counts.py b/freemocap/tests/test_synchronized_video_frame_counts.py
new file mode 100644
index 00000000..3022e5ad
--- /dev/null
+++ b/freemocap/tests/test_synchronized_video_frame_counts.py
@@ -0,0 +1,23 @@
+from pathlib import Path
+from typing import Union
+
+from freemocap.tests.utilities.get_number_of_frames_of_videos_in_a_folder import (
+ get_number_of_frames_of_videos_in_a_folder,
+)
+
+
+def test_synchronized_video_frame_counts(video_folder_path: Union[Path, str]):
+ """
+ Test if all the videos in this folder have precisely the same number of frames
+ """
+ list_of_video_paths = list(Path(video_folder_path).glob("*.mp4"))
+
+ assert len(list_of_video_paths) > 0, f"No videos found in {video_folder_path}"
+
+ frame_count = get_number_of_frames_of_videos_in_a_folder(video_folder_path)
+
+ assert (
+ len(set(frame_count)) == 1
+ ), f"Videos in {video_folder_path} have different frame counts: {frame_count}"
+
+ return True
diff --git a/freemocap/tests/test_test.py b/freemocap/tests/test_test.py
new file mode 100644
index 00000000..6dff5d28
--- /dev/null
+++ b/freemocap/tests/test_test.py
@@ -0,0 +1,9 @@
+def returnTrue():
+ try:
+ return True
+ except:
+ return False
+
+
+def test_test():
+ assert returnTrue() == True
\ No newline at end of file
diff --git a/freemocap/tests/test_total_body_center_of_mass_data_shape.py b/freemocap/tests/test_total_body_center_of_mass_data_shape.py
new file mode 100644
index 00000000..acc41c34
--- /dev/null
+++ b/freemocap/tests/test_total_body_center_of_mass_data_shape.py
@@ -0,0 +1,37 @@
+from pathlib import Path
+from typing import Union
+
+import numpy as np
+
+from freemocap.tests.utilities.get_number_of_frames_of_videos_in_a_folder import (
+ get_number_of_frames_of_videos_in_a_folder,
+)
+
+
+def test_total_body_center_of_mass_data_shape(
+ synchronized_videos_folder: Union[str, Path],
+ total_body_center_of_mass_npy_file_path: Union[str, Path],
+):
+
+ assert Path(
+ total_body_center_of_mass_npy_file_path
+ ).is_file(), f"No file found at {total_body_center_of_mass_npy_file_path}"
+
+ total_body_center_of_mass_fr_xyz = np.load(total_body_center_of_mass_npy_file_path)
+
+ frame_count = get_number_of_frames_of_videos_in_a_folder(synchronized_videos_folder)
+ assert (
+ len(set(frame_count)) == 1
+ ), f"Videos in {synchronized_videos_folder} have different frame counts: {frame_count}"
+
+ number_of_frames = frame_count[0]
+
+ assert (
+ total_body_center_of_mass_fr_xyz.shape[0] == number_of_frames
+ ), f"Number of frames in {total_body_center_of_mass_npy_file_path} does not match number of frames of videos in {synchronized_videos_folder}"
+
+ assert (
+ total_body_center_of_mass_fr_xyz.shape[1] == 3
+ ), f"`total_body_center_of_mass_fr_xyz.shape[1]` should have 3 dimensions (X,Y,Z) "
+
+ return True
diff --git a/freemocap/tests/utilities/get_number_of_frames_of_videos_in_a_folder.py b/freemocap/tests/utilities/get_number_of_frames_of_videos_in_a_folder.py
new file mode 100644
index 00000000..1f51285d
--- /dev/null
+++ b/freemocap/tests/utilities/get_number_of_frames_of_videos_in_a_folder.py
@@ -0,0 +1,28 @@
+import logging
+from pathlib import Path
+from typing import Union
+
+import cv2
+
+logger = logging.getLogger(__name__)
+
+
+def get_number_of_frames_of_videos_in_a_folder(folder_path: Union[str, Path]):
+ """
+ Get the number of frames in the first video in a folder
+ """
+
+ list_of_video_paths = list(Path(folder_path).glob("*.mp4"))
+
+ if len(list_of_video_paths) == 0:
+ logger.error(f"No videos found in {folder_path}")
+ return None
+
+ frame_count = []
+ for video_path in list_of_video_paths:
+ cap = cv2.VideoCapture(str(video_path))
+ frame_count.append(int(cap.get(cv2.CAP_PROP_FRAME_COUNT)))
+ cap.release()
+
+
+ return frame_count
diff --git a/freemocap/utilities/save_dictionary_to_json.py b/freemocap/utilities/save_dictionary_to_json.py
new file mode 100644
index 00000000..ad146326
--- /dev/null
+++ b/freemocap/utilities/save_dictionary_to_json.py
@@ -0,0 +1,18 @@
+import json
+import logging
+from pathlib import Path
+from typing import Union
+
+logger = logging.getLogger(__name__)
+
+
+def save_dictionary_to_json(save_path: Union[Path, str], dictionary: dict, file_name: str):
+ if file_name.split(".")[-1] != "json":
+ file_name = f"{file_name}.json"
+
+ json_file_path = Path(save_path) / file_name
+
+ with open(json_file_path, "w") as file:
+ json.dump(dictionary, file, indent=4)
+
+ logger.info(f"Saved dictionary {file_name} as json at: {json_file_path}")
diff --git a/ipython_jupyter_notebooks/rotate_translate_skeleton.ipynb b/ipython_jupyter_notebooks/rotate_translate_skeleton.ipynb
index bee115c4..a82b5a52 100644
--- a/ipython_jupyter_notebooks/rotate_translate_skeleton.ipynb
+++ b/ipython_jupyter_notebooks/rotate_translate_skeleton.ipynb
@@ -320,7 +320,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
- "version": "3.9.12"
+ "version": "3.9.12 (main, Apr 4 2022, 05:22:27) [MSC v.1916 64 bit (AMD64)]"
},
"vscode": {
"interpreter": {
diff --git a/mkdocs.yml b/mkdocs.yml
deleted file mode 100644
index 39dc58d5..00000000
--- a/mkdocs.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-# originally copied from - https://squidfunk.github.io/mkdocs-material/creating-your-site/#configuration
-
-# yaml-language-server: $schema=https://squidfunk.github.io/mkdocs-material/schema.json
-site_name: My Docs
-theme:
- name: material
\ No newline at end of file
diff --git a/pyproject.toml b/pyproject.toml
index 278c391d..3065aace 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,7 +1,119 @@
+# pyproject.toml
+# originally based on - https://realpython.com/pypi-publish-python-package/
+
+[build-system]
+requires = ["flit_core >=3.2,<4"]
+build-backend = "flit_core.buildapi"
+
+[project]
+name = "freemocap"
+readme = "README.md"
+authors = [
+ { name = "Skelly FreeMoCap", email = "[email protected]" },
+ { name = "Endurance Idehen" },
+ { name = "Aaron Cherian" },
+ { name = "Jonathan Samir Matthis" },
+]
+license = { file = "LICENSE" }
+classifiers = [
+ "Development Status :: 3 - Alpha",
+ "License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)",
+ "Intended Audience :: Developers",
+ "Intended Audience :: Education",
+ "Intended Audience :: Healthcare Industry",
+ "Intended Audience :: Science/Research",
+ "Intended Audience :: End Users/Desktop",
+ "Intended Audience :: Other Audience",
+ "Natural Language :: English",
+ "Operating System :: OS Independent",
+ "Programming Language :: Python :: 3",
+ "Programming Language :: Python :: 3.8",
+ "Programming Language :: Python :: 3.9",
+ "Programming Language :: Python :: 3.10",
+ "Programming Language :: Python :: 3.11",
+ "Topic :: Software Development :: Libraries :: Python Modules",
+ "Topic :: Utilities",
+ "Topic :: Multimedia :: Video",
+ "Topic :: Multimedia :: Video :: Capture",
+ "Topic :: Multimedia :: Video :: Display",
+ "Topic :: Scientific/Engineering",
+ "Topic :: Scientific/Engineering :: Image Processing",
+ "Topic :: Scientific/Engineering :: Visualization",
+ "Topic :: Scientific/Engineering :: Human Machine Interfaces",
+ "Topic :: System :: Hardware",
+ "Topic :: System :: Hardware :: Universal Serial Bus (USB)",
+ "Topic :: System :: Hardware :: Universal Serial Bus (USB) :: Video (UVC)",
+]
+keywords = [
+ "camera",
+ "stream",
+ "video",
+ "image",
+ "opencv",
+ "skelly",
+ "freemocap",
+ "motion capture",
+ "markerless motion capture",
+ "mocap",
+ "markerless mocap",
+ "markerless",
+ "kinematic",
+ "animation",
+ "3d animation",
+ "Blender",
+ "Blender3d",
+ "synchronization",
+ "computer vision"
+]
+
+#dynamic = ["dependencies"]
+dependencies = [
+ "skellycam==2023.2.1076",
+ "skelly_viewer",
+ "mediapipe",
+ "opencv-contrib-python==4.6.0.66",
+ "toml",
+ "aniposelib",
+]
+requires-python = ">=3.8, <3.11"
+
+dynamic = ["version", "description"]
+
+[project.optional-dependencies]
+dev = ["black", "bumpver", "isort", "pip-tools", "pytest", "flit"]
+
+[project.urls]
+Homepage = "https://freemocap.org"
+Documentation = "https://freemocap.readthedocs.io/en/latest/"
+Github = "https://github.com/freemocap/freemocap"
+
+[tool.bumpver]
+current_version = "v1.0.0-rc"
+version_pattern = "vMAJOR.MINOR.PATCH[-TAG]"
+commit_message = "Bump version {old_version} -> {new_version}"
+commit = true
+tag = true
+push = true
+
+[tool.bumpver.file_patterns]
+#"pyproject.toml" = ['current_version = "{version}"', 'version = "{version}"']
+"freemocap/__init__.py" = ["{version}"]
+
+#[tool.setuptools.dynamic]
+#dependencies = {file = "requirements.txt"}
+
+[project.scripts]
+freemocap = "freemocap.__main__:main"
+
+[tool.setuptools]
+py-modules = ["freemocap"]
+
+[tool.black]
+line-length = 120
[tool.taskipy.tasks]
setup = "pre-commit install"
-test = "python -m unittest src/tests/**/test_*"
+#test = "python -m unittest freemocap/tests/**/test_*"
installer = "./bin/installer.sh"
# This command ensures that your code is formatted appropriately
-format = "black src/"
\ No newline at end of file
+format = "black freemocap"
\ No newline at end of file
diff --git a/setup.cfg b/setup.cfg
deleted file mode 100644
index dba01f9b..00000000
--- a/setup.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-[versioneer]
-VCS = git
-style = pep440-pre
-versionfile_source = src/_version.py
-versionfile_build = src/_version.py
-tag_prefix = v
diff --git a/setup.py b/setup.py
index da46c930..ad1ad5d4 100644
--- a/setup.py
+++ b/setup.py
@@ -1,79 +1,5 @@
-from os import path
-from setuptools import setup, find_packages
-import sys
-import versioneer
+# setup.py
+from setuptools import setup
-# NOTE: This file must remain Python 2 compatible for the foreseeable future,
-# to ensure that we error out properly for people with outdated setuptools
-# and/or pip.
-min_version = (3, 7)
-if sys.version_info < min_version:
- error = """
-freemocap does not support Python {0}.{1}.
-Python {2}.{3} and above is required. Check your Python version like so:
-
-python3 --version
-
-This may be due to an out-of-date pip. Make sure you have pip >= 9.0.1.
-Upgrade pip like so:
-
-pip install --upgrade pip
-""".format(
- *(sys.version_info[:2] + min_version)
- )
- sys.exit(error)
-
-here = path.abspath(path.dirname(__file__))
-
-with open(path.join(here, "README.md"), encoding="utf-8") as readme_file:
- readme = readme_file.read()
-
-with open(path.join(here, "requirements.txt")) as requirements_file:
- # Parse requirements.txt, ignoring any commented-out lines.
- requirements = [
- line
- for line in requirements_file.read().splitlines()
- if not line.startswith("#")
- ]
-
-
-setup(
- name="freemocap",
- version=versioneer.get_version(),
- cmdclass=versioneer.get_cmdclass(),
- description="The FreeMoCap Project: A free-and-open-source, hardware-and-software-agnostic, minimal-cost, research-grade, motion start system and platform for decentralized scientific research, education, and training",
- long_description=readme,
- author="Jonathan Samir Matthis",
- author_email="[email protected]",
- url="https://github.com/jonmatthis/freemocap",
- python_requires=">={}".format(".".join(str(n) for n in min_version)),
- packages=find_packages(exclude=["docs", "tests"]),
- entry_points={
- "console_scripts": [
- # 'command = some.module:some_function',
- ],
- },
- include_package_data=True,
- package_data={
- "freemocap": [
- # When adding files here, remember to update MANIFEST.in as well,
- # or else they will not be included in the distribution on PyPI!
- # 'path/to/data_file',
- ]
- },
- install_requires=requirements,
- extras_require={
- "dlc": [
- "tensorflow-gpu>=2.0",
- "tf_slim>=1.1.0",
- "deeplabcut>=2.2",
- ]
- },
- license="AGPLv3",
- classifiers=[
- "Development Status :: 2 - Pre-Alpha",
- "Natural Language :: English",
- "Programming Language :: Python :: 3",
- ],
-)
+setup()
diff --git a/src/README.md b/src/README.md
deleted file mode 100644
index 43f9e197..00000000
--- a/src/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-Installation instructions for Mac
-
-- brew install python-tk
-- brew install openh264
\ No newline at end of file
diff --git a/src/__init__.py b/src/__init__.py
deleted file mode 100644
index 3be04a42..00000000
--- a/src/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from src.log.config import configure_logging
-
-configure_logging()
diff --git a/src/api/__init__.py b/src/api/__init__.py
deleted file mode 100644
index 139597f9..00000000
--- a/src/api/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/src/api/app_factory.py b/src/api/app_factory.py
deleted file mode 100644
index b3fa9d55..00000000
--- a/src/api/app_factory.py
+++ /dev/null
@@ -1,21 +0,0 @@
-import uvicorn
-from fastapi import FastAPI
-
-from src.api.middleware.cors import cors
-from src.api.routes import enabled_routers
-
-
-def create_app(*args, **kwargs):
- _app = FastAPI()
-
- cors(_app)
-
- for router in enabled_routers:
- _app.include_router(router)
-
- return _app
-
-
-if __name__ == "__main__":
- script_app = create_app()
- uvicorn.run(script_app, host="127.0.0.1", port=8080, log_level="info")
diff --git a/src/api/globals.py b/src/api/globals.py
deleted file mode 100644
index ba061d96..00000000
--- a/src/api/globals.py
+++ /dev/null
@@ -1 +0,0 @@
-# TODO: The globals that are saved here will be replaced by different solutions upcoming
diff --git a/src/api/middleware/cors.py b/src/api/middleware/cors.py
deleted file mode 100644
index a19890ab..00000000
--- a/src/api/middleware/cors.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from fastapi.middleware.cors import CORSMiddleware
-
-
-def cors(app):
- app.add_middleware(
- CORSMiddleware,
- allow_origins=["*"],
- allow_credentials=True,
- allow_methods=["*"],
- allow_headers=["*"],
- )
diff --git a/src/api/routes/__init__.py b/src/api/routes/__init__.py
deleted file mode 100644
index 299ceb02..00000000
--- a/src/api/routes/__init__.py
+++ /dev/null
@@ -1,16 +0,0 @@
-from src.api.routes.camera.cam_data_ws import cam_ws_router
-from src.api.routes.camera.camera_route import camera_router
-from src.api.routes.health.health_check_route import healthcheck_router
-from src.api.routes.home.home import home_router
-from src.api.routes.session.session_router import session_router
-from src.api.routes.startup.startup import startup_router
-
-# REGISTER NEW ROUTES HERE
-enabled_routers = [
- healthcheck_router,
- camera_router,
- cam_ws_router,
- startup_router,
- home_router,
- session_router,
-]
diff --git a/src/api/routes/camera/cam_data_ws.py b/src/api/routes/camera/cam_data_ws.py
deleted file mode 100644
index 78da6d75..00000000
--- a/src/api/routes/camera/cam_data_ws.py
+++ /dev/null
@@ -1,35 +0,0 @@
-import logging
-import time
-from datetime import datetime
-
-import cv2
-import numpy as np
-from fastapi import APIRouter, WebSocket
-
-from src.cameras.capture.dataclasses.frame_payload import FramePayload
-
-logger = logging.getLogger(__name__)
-
-cam_ws_router = APIRouter()
-
-
-async def websocket_send(web_socket: WebSocket, input_payload: FramePayload):
- if not input_payload.success:
- return
- success, frame = cv2.imencode(".png", input_payload.image)
- if not success:
- return
- await web_socket.send_bytes(frame.tobytes())
-
-
-@cam_ws_router.websocket("/ws/hello_world")
-async def preview_webcam(web_socket: WebSocket):
- await web_socket.accept()
- while True:
- last_read = time.perf_counter()
- byte_data = await web_socket.receive_bytes()
- time_since = time.perf_counter()
- print(f"Per Frame Time: {time_since - last_read:.4f}")
- buffer = np.frombuffer(byte_data, dtype="uint8").reshape((600, 800, 4))
- buffer = cv2.cvtColor(buffer, cv2.COLOR_BGR2RGB)
- print(f"image shape: {buffer.shape}")
diff --git a/src/api/routes/camera/camera_route.py b/src/api/routes/camera/camera_route.py
deleted file mode 100644
index 7541168a..00000000
--- a/src/api/routes/camera/camera_route.py
+++ /dev/null
@@ -1,82 +0,0 @@
-import logging
-
-import cv2
-from fastapi import APIRouter
-from pydantic import BaseModel
-
-from src.api.services.user_config import UserConfigService, WebcamConfigModel
-from src.cameras.detection.cam_singleton import get_or_create_cams
-from src.cameras.multicam_manager.cv_camera_manager import OpenCVCameraManager
-
-camera_router = APIRouter()
-
-logger = logging.getLogger(__name__)
-
-
-class CameraPreviewModel(BaseModel):
- session_id: str = None
-
-
-@camera_router.post("/camera/config/{session_id}")
-async def config_cam(webcam_config_model: WebcamConfigModel, session_id):
- s = UserConfigService()
- return s.save_webcam_config_to_disk(webcam_config_model, session_id)
-
-
-@camera_router.post("/camera/show_camera/{webcam_id}")
-async def show_camera(
- webcam_id: str, camera_preview_model: CameraPreviewModel = CameraPreviewModel()
-):
- cv_cam_manager = OpenCVCameraManager(session_id=camera_preview_model.session_id)
- with cv_cam_manager.start_capture_session_single_cam(
- webcam_id
- ) as connected_camera_and_writer:
- should_continue = True
- this_camera = connected_camera_and_writer.cv_camera
- cv2_window_name = "(ESC to close) PREVIEWING camera_" + webcam_id
- while should_continue:
- if not this_camera.new_frame_ready:
- continue
- cv2.imshow(cv2_window_name, this_camera.latest_frame.image)
- # exit loop when user presses ESC key
- exit_key = cv2.waitKey(1)
- if exit_key == 27:
- logger.info("ESC has been pressed.")
- should_continue = False
- cv2.destroyWindow(cv2_window_name)
-
-
-@camera_router.post("/camera/show_cameras")
-async def cv2_imshow_all_camera(
- camera_preview_model: CameraPreviewModel = CameraPreviewModel(),
-):
- cv_cam_manager = OpenCVCameraManager(session_id=camera_preview_model.session_id)
- with cv_cam_manager.start_capture_session_all_cams() as connected_cameras_dict:
- logger.info(f"Available cameras: {connected_cameras_dict}")
- should_continue = True
- while should_continue:
- for this_webcam_id, this_open_cv_camera in connected_cameras_dict.items():
- exit_key = cv2.waitKey(1)
- if exit_key == 27:
- logger.info("ESC has been pressed.")
- should_continue = False
- cv2.destroyWindow(cv2_window_name)
- if not this_open_cv_camera.new_frame_ready:
- continue
- cv2_window_name = "(ESC to close) PREVIEWING camera_" + this_webcam_id
- cv2.imshow(cv2_window_name, this_open_cv_camera.latest_frame.image)
- exit_key = cv2.waitKey(1)
- if exit_key == 27:
- logger.info("ESC has been pressed.")
- should_continue = False
- cv2.destroyWindow(cv2_window_name)
-
-
-@camera_router.get("/camera/detect")
-async def get_cameras():
- return get_or_create_cams()
-
-
-@camera_router.get("/camera/redetect")
-async def redetect_cameras():
- return get_or_create_cams(always_create=True)
diff --git a/src/api/routes/health/health_check_route.py b/src/api/routes/health/health_check_route.py
deleted file mode 100644
index d4477efd..00000000
--- a/src/api/routes/health/health_check_route.py
+++ /dev/null
@@ -1,16 +0,0 @@
-from fastapi import APIRouter
-from pydantic import BaseModel
-
-healthcheck_router = APIRouter()
-
-
-class HealthCheckResponse(BaseModel):
- message: str = "OK"
-
-
-@healthcheck_router.get("/health")
-def route():
- try:
- return HealthCheckResponse()
- except:
- raise ValueError("Unhealthy")
diff --git a/src/api/routes/home/home.py b/src/api/routes/home/home.py
deleted file mode 100644
index 090c895f..00000000
--- a/src/api/routes/home/home.py
+++ /dev/null
@@ -1,10 +0,0 @@
-from fastapi import APIRouter
-
-home_router = APIRouter()
-
-
-@home_router.get("/")
-async def hello():
- response_string = "hello :D"
- print(f"response string: {response_string}")
- return response_string
diff --git a/src/api/routes/session/session_router.py b/src/api/routes/session/session_router.py
deleted file mode 100644
index a9d9920b..00000000
--- a/src/api/routes/session/session_router.py
+++ /dev/null
@@ -1,213 +0,0 @@
-import logging
-import traceback
-from pathlib import Path
-from typing import Optional, Union
-
-from fastapi import APIRouter
-from pydantic import BaseModel
-
-from jon_scratch.pupil_calibration_pipeline.qt_gl_laser_skeleton_visualizer import (
- QtGlLaserSkeletonVisualizer,
-)
-from src.cameras.launch_camera_frame_loop import launch_camera_frame_loop
-from src.cameras.multicam_manager.cv_camera_manager import OpenCVCameraManager
-from src.config.home_dir import (
- create_default_session_id,
- get_session_folder_path,
- get_most_recent_session_id,
- create_session_folder,
-)
-from src.core_processes.mediapipe_stuff.mediapipe_skeleton_detector import (
- MediaPipeSkeletonDetector,
-)
-from src.pipelines.calibration_pipeline.calibration_pipeline_orchestrator import (
- CalibrationPipelineOrchestrator,
-)
-from src.pipelines.session_pipeline.session_pipeline_orchestrator import (
- SessionPipelineOrchestrator,
- load_mediapipe3d_skeleton_data,
- load_mediapipe2d_data,
-)
-
-logger = logging.getLogger(__name__)
-
-session_router = APIRouter()
-
-
-class TweakedPydanticBaseModel(BaseModel):
- class Config:
- arbitrary_types_allowed = True
-
-
-class SessionCreateModel(BaseModel):
- user_session_tag_str: Optional[str]
-
-
-class SessionResponse(BaseModel):
- session_id: str
- session_path: str
-
-
-class SessionCalibrateModel(TweakedPydanticBaseModel):
- """
- session_id: str, ID for the session we're calibrating
- charuco_square_size:Union[int, float], the size of one of the black squares on the charuco board (preferably) in milimeters
- """
-
- session_id: str = None
- webcam_configs_dict: dict = None
- opencv_camera_manager: OpenCVCameraManager = None
- charuco_square_size: Union[int, float] = 39
-
-
-class SessionRecordModel(TweakedPydanticBaseModel):
- session_id: str = None
- webcam_configs_dict: dict = None
-
-
-class SessionIdModel(BaseModel):
- """ """
-
- session_id: str = None
-
-
-@session_router.post("/session/create")
-async def create_session(
- session_create_model: SessionCreateModel = SessionCreateModel(),
-) -> SessionResponse:
- session_id = create_default_session_id()
- if session_create_model.user_session_tag_str is not None:
- session_id = session_id + session_create_model.user_session_tag_str
-
- create_session_folder(session_id)
-
- return SessionResponse(
- session_id=session_id, session_path=get_session_folder_path(session_id)
- )
-
-
-@session_router.post("/session/calibrate")
-def calibrate_session(
- session_calibrate_model: SessionCalibrateModel = SessionCalibrateModel(),
-):
- """calibate start volume - record synchronized videos (from all available camras wtih default parameters for now) and process with Anipose to produce a camera calibration (saved as a `.toml` file in the session folder"""
-
- session_id = session_calibrate_model.session_id
- if session_id is None or session_id == "string":
- session_id = get_most_recent_session_id()
-
- calibration_orchestrator = CalibrationPipelineOrchestrator(session_id)
-
- # calibration_orchestrator.record_videos(show_visualizer_gui=False,
- # save_video_in_frame_loop=False,
- # show_camera_views_in_windows=True,
- # )
-
- launch_camera_frame_loop(
- session_id=session_id,
- webcam_configs_dict=session_calibrate_model.webcam_configs_dict,
- show_camera_views_in_windows=True,
- calibration_videos_bool=True,
- detect_charuco_in_image=True,
- )
-
- try:
- calibration_orchestrator.run_anipose_camera_calibration(
- charuco_square_size=session_calibrate_model.charuco_square_size,
- pin_camera_0_to_origin=True,
- )
- except:
- logger.error("Printing Traceback")
- traceback.print_exc()
-
- return calibration_orchestrator
-
-
-@session_router.post("/session/record")
-def record_session(session_record_model: SessionRecordModel = SessionRecordModel()):
- launch_camera_frame_loop(
- session_id=session_record_model.session_id,
- webcam_configs_dict=session_record_model.webcam_configs_dict,
- show_camera_views_in_windows=True,
- calibration_videos_bool=False,
- detect_charuco_in_image=True,
- )
-
-
-@session_router.post("/session/mediapipe_track_skeletons_offline")
-def mediapipe_track_2D_skeletons_offline(
- session_id_model: SessionIdModel = SessionIdModel(),
-):
- if session_id_model.session_id is None or session_id_model.session_id == "string":
- this_session_id = get_most_recent_session_id()
- logger.info(f"loading most recent session:{this_session_id}")
- else:
- this_session_id = session_id_model.session_id
-
- logger.info(
- f"tracking 2D mediapipe skeletons in videos from session: {this_session_id}"
- )
- mediapipe_skeleton_detector = MediaPipeSkeletonDetector(this_session_id)
- mediapipe_skeleton_detector.process_session_folder()
-
-
-@session_router.post("/session/reconstruct_mediapipe3d_offline")
-def mediapipe_reconstruct_3D_skeletons_offline(session_id_model: SessionIdModel = None):
- if session_id_model is None or session_id_model.session_id == "string":
- session_id = get_most_recent_session_id()
- else:
- session_id = session_id_model.session_id
-
- this_session_orchestrator = SessionPipelineOrchestrator(session_id=session_id)
- this_session_orchestrator.anipose_camera_calibration_object = (
- CalibrationPipelineOrchestrator().load_calibration_from_session_id(session_id)
- )
- this_session_orchestrator.mediapipe2d_numCams_numFrames_numTrackedPoints_XY = (
- load_mediapipe2d_data(session_id)
- )
- this_session_orchestrator.reconstruct3d_from_2d_data_offline()
-
-
-@session_router.post("/session/visualize_offline")
-def visualize_session_offline(session_id_model: SessionIdModel = None):
- if session_id_model is None or session_id_model.session_id == "string":
- session_id = get_most_recent_session_id()
- else:
- session_id = session_id_model.session_id
-
- mediapipe3d_data_payload = load_mediapipe3d_skeleton_data(session_id)
-
- mediapipe3d_skeleton_nFrames_nTrajectories_xyz = (
- mediapipe3d_data_payload.data3d_numFrames_numTrackedPoints_XYZ
- )
- mediapipe3d_skeleton_nFrames_nTrajectories_reprojectionError = (
- mediapipe3d_data_payload.data3d_numFrames_numTrackedPoint_reprojectionError
- )
-
- qt_gl_laser_skeleton = QtGlLaserSkeletonVisualizer(
- mediapipe_skel_fr_mar_xyz=mediapipe3d_skeleton_nFrames_nTrajectories_xyz
- )
- qt_gl_laser_skeleton.start_animation()
-
-
-if __name__ == "__main__":
- # # create_blend_file_from_session_data
- # session_id_in = create_default_session_id('session_router_as_main')
- # session_id_model = SessionIdModel(session_id=session_id_in)
- #
- # # # #calibrate_session
- # session_calibrate_model_in = SessionCalibrateModel(session_id=session_id_in,
- # charuco_square_size=39)
- # calibrate_session(session_calibrate_model_in)
- #
- # # # record new session
- # session_record_model_in = SessionRecordModel(session_id=session_id_in,)
- # record_session(session_record_model_in)
- #
- # # #process_
- # mediapipe_track_2D_skeletons_offline()
- #
- # mediapipe_reconstruct_3D_skeletons_offline()
-
- # #visualize with PyQt/OpenGL
- visualize_session_offline()
diff --git a/src/api/routes/startup/startup.py b/src/api/routes/startup/startup.py
deleted file mode 100644
index d259fec3..00000000
--- a/src/api/routes/startup/startup.py
+++ /dev/null
@@ -1,10 +0,0 @@
-from fastapi import APIRouter
-
-from src.config.data_paths import create_home_data_directory
-
-startup_router = APIRouter()
-
-
-@startup_router.on_event("startup")
-async def handle_startup():
- create_home_data_directory()
diff --git a/src/api/services/board_detect_service.py b/src/api/services/board_detect_service.py
deleted file mode 100644
index 4077396d..00000000
--- a/src/api/services/board_detect_service.py
+++ /dev/null
@@ -1,10 +0,0 @@
-from typing import NamedTuple
-
-
-class ImageResponse(NamedTuple):
- image: bytes
- webcam_id: str
-
-
-class BoardDetectService:
- pass
diff --git a/src/api/services/mediapipe_detect_service.py b/src/api/services/mediapipe_detect_service.py
deleted file mode 100644
index d000c853..00000000
--- a/src/api/services/mediapipe_detect_service.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from src.cameras.multicam_manager.cv_camera_manager import OpenCVCameraManager
-
-
-class MediapipeSkeletonDetectionService:
- pass
diff --git a/src/api/services/user_config.py b/src/api/services/user_config.py
deleted file mode 100644
index f189911a..00000000
--- a/src/api/services/user_config.py
+++ /dev/null
@@ -1,56 +0,0 @@
-import json
-import logging
-from pathlib import Path
-
-from pydantic import BaseModel
-
-from src.config.home_dir import get_session_folder_path
-
-logger = logging.getLogger(__name__)
-
-
-class WebcamConfigModel(BaseModel):
- webcam_id: str
- exposure: int = -6
- resolution_width: int = 1280
- resolution_height: int = 720
-
-
-def get_camera_name(camera_id: str):
- return "camera_" + camera_id
-
-
-class UserConfigService:
- """take things like WebcamConfigModel and save it to a text file or whatever"""
-
- def save_webcam_config_to_disk(
- self, webcam_config_model: WebcamConfigModel, session_id: str
- ):
- webcam_config_json = webcam_config_model.json()
- camera_name = get_camera_name(webcam_config_model.webcam_id)
- json_file_name = camera_name + "_config.json"
- session_path = get_session_folder_path(session_id)
- webcam_config_json_path = Path(session_path) / json_file_name
- with open(webcam_config_json_path, "w") as outfile:
- outfile.write(str(webcam_config_json))
- return webcam_config_json
-
- def webcam_config_by_id(self, webcam_id: str, session_id: str) -> WebcamConfigModel:
- if session_id is None:
- return WebcamConfigModel(webcam_id=webcam_id)
- session_path = get_session_folder_path(session_id)
- camera_name = get_camera_name(webcam_id)
- print(f"webcam id (again): {webcam_id}")
- print(f"camera name: {camera_name}")
- json_file_name = camera_name + "_config.json"
- webcam_config_json_path = Path(session_path) / json_file_name
-
- try:
- webcam_config_model = WebcamConfigModel.parse_file(webcam_config_json_path)
- logger.info(f"loading webcam_config from: {webcam_config_json_path}")
- return webcam_config_model
- except FileNotFoundError:
- logger.info(
- f"No webcam config file found for this camera, using default camera parameters"
- )
- return WebcamConfigModel(webcam_id=webcam_id)
diff --git a/src/blender_stuff/bind_rigify_meta_rig_to_freemocap_data.py b/src/blender_stuff/bind_rigify_meta_rig_to_freemocap_data.py
deleted file mode 100644
index 87433095..00000000
--- a/src/blender_stuff/bind_rigify_meta_rig_to_freemocap_data.py
+++ /dev/null
@@ -1,892 +0,0 @@
-from typing import List
-
-import bpy
-import addon_utils
-
-import numpy as np
-from pathlib import Path
-import json
-
-import sys
-
-print("Running script to create Blender file from freemocap session data: " + __file__)
-###############################################################
-### parse arguments from command line
-
-try:
- ##% Session path
- # #get session path as command line argument
- argv = sys.argv
- argv = argv[argv.index("--") + 1 :]
-
- session_path = Path(argv[0])
- print(f"session_path: {session_path}")
-
- if len(argv) > 1:
- good_clean_frame_number = int(argv[1])
- else:
- good_clean_frame_number = 0
-
- print(f" user specified `good clean frame number`: {good_clean_frame_number}")
-except Exception as e:
- print(e)
- print(
- "we appear to be running from the Blender Scripting tab! Manually enter your `session_path` at line 23"
- )
- # TODO - This should point to some kinda online-hosted demo session data or something
- session_path = Path(
- r"D:\Dropbox\FreeMoCapProject\teddy_animation\FreeMocap_Data\sesh_2022-10-01_13_38_04_paul_dance_2"
- )
- good_clean_frame_number = (
- 0 # pick a frame where subject is in a good pose (e.g. T- or A-pose
- )
-
-############
-## Define some things that we'll need later
-
-# Mediapipe Tracked Point Names
-mediapipe_body_trajectory_names = [
- "nose",
- "left_eye_inner",
- "left_eye",
- "left_eye_outer",
- "right_eye_inner",
- "right_eye",
- "right_eye_outer",
- "left_ear",
- "right_ear",
- "mouth_left",
- "mouth_right",
- "left_shoulder",
- "right_shoulder",
- "left_elbow",
- "right_elbow",
- "left_wrist",
- "right_wrist",
- "left_pinky",
- "right_pinky",
- "left_index",
- "right_index",
- "left_thumb",
- "right_thumb",
- "left_hip",
- "right_hip",
- "left_knee",
- "right_knee",
- "left_ankle",
- "right_ankle",
- "left_heel",
- "right_heel",
- "left_foot_index",
- "right_foot_index",
-]
-
-mediapipe_virtual_marker_definitions_dict = {
- "head_center": {
- "marker_names": ["left_ear", "right_ear"],
- "marker_weights": [0.5, 0.5],
- },
- "neck_center": {
- "marker_names": ["left_shoulder", "right_shoulder"],
- "marker_weights": [0.5, 0.5],
- },
- "hips_center": {
- "marker_names": ["left_hip", "right_hip"],
- "marker_weights": [0.5, 0.5],
- },
- "trunk_center": {
- "marker_names": ["left_shoulder", "right_shoulder", "left_hip", "right_hip"],
- "marker_weights": [0.25, 0.25, 0.25, 0.25],
- },
-}
-
-# Skeleton segments names and the rigify bone names that they correspond to
-rigify_bone_to_skeleton_segment_name_correspondance = {
- "lower_spine": ["spine", "spine.001"],
- "upper_spine": ["spine.002", "spine.003"],
- "head": ["spine.004", "spine.005", "spine.006"],
- "left_hand": ["hand.L"],
- "left_forearm": ["forearm.L"],
- "left_upper_arm": ["upper_arm.L"],
- "right_hand": ["hand.R"],
- "right_forearm": ["forearm.R"],
- "right_upper_arm": ["upper_arm.R"],
- "left_thigh": ["thigh.L"],
- "left_calf": ["shin.L"],
- "left_foot": ["foot.L"],
- "right_thigh": ["thigh.R"],
- "right_calf": ["shin.R"],
- "right_foot": ["foot.R"],
-}
-
-# A dictionary where the `keys` are rigify bone names and the `values` are bone constraints and their parameters.
-# NOTE - the `targets` must correspond to the `mediapipe_body_names` list above (or one of the virtural markers we'll make later)
-rig_constraint_dict_of_dicts = {
- "spine": {
- "COPY_LOCATION": {"target": "hips_center"},
- },
- "spine.003": {
- "IK": {"target": "neck_center", "chain_length": 4},
- },
- "spine.004": {
- "COPY_LOCATION": {"target": "neck_center"},
- },
- "spine.006": {
- "IK": {"target": "head_center", "chain_length": 2},
- },
- "face": {
- "COPY_LOCATION": {"target": "armature", "subtarget": "spine.006"},
- "DAMPED_TRACK": {
- "target": "head_center",
- },
- "LOCKED_TRACK": {
- "target": "nose",
- "track_axis": "TRACK_Z",
- "lock_axis": "LOCK_Y",
- "influence": 1.0,
- },
- "LOCKED_TRACK.001": {
- "target": "left_ear",
- "track_axis": "TRACK_Z",
- "lock_axis": "LOCK_Z",
- "influence": 1.0,
- },
- },
- "shoulder.R": {
- "COPY_LOCATION": {"target": "neck_center"},
- "DAMPED_TRACK": {"target": "right_shoulder"},
- },
- "upper_arm.R": {
- "DAMPED_TRACK": {"target": "right_elbow"},
- },
- "forearm.R": {
- "DAMPED_TRACK": {"target": "right_wrist"},
- },
- "hand.R": {
- "DAMPED_TRACK": {"target": "right_index"},
- },
- "shoulder.L": {
- "COPY_LOCATION": {"target": "neck_center"},
- "DAMPED_TRACK": {"target": "left_shoulder"},
- },
- "upper_arm.L": {
- "DAMPED_TRACK": {"target": "left_elbow"},
- },
- "forearm.L": {
- "DAMPED_TRACK": {"target": "left_wrist"},
- },
- "hand.L": {
- "DAMPED_TRACK": {"target": "left_index"},
- },
- "thigh.R": {
- "COPY_LOCATION": {"target": "right_hip"},
- "DAMPED_TRACK": {"target": "right_knee"},
- },
- "shin.R": {
- "DAMPED_TRACK": {"target": "right_ankle"},
- },
- "foot.R": {
- "DAMPED_TRACK": {"target": "right_foot_index"},
- },
- "thigh.L": {
- "COPY_LOCATION": {"target": "left_hip"},
- "DAMPED_TRACK": {"target": "left_knee"},
- },
- "shin.L": {
- "DAMPED_TRACK": {"target": "left_ankle"},
- },
- "foot.L": {
- "DAMPED_TRACK": {"target": "left_foot_index"},
- },
-}
-
-# connects the dots what for to make the stick figure friend
-stick_figure_mesh_edges_list_of_lists = [
- ["head_center", "nose"],
- ["nose", "left_eye_inner"],
- ["left_eye_inner", "left_eye"],
- ["left_eye", "left_eye_outer"],
- ["left_eye_outer", "left_ear"],
- ["nose", "right_eye_inner"],
- ["right_eye_inner", "right_eye"],
- ["right_eye", "right_eye_outer"],
- ["right_eye_outer", "right_ear"],
- ["nose", "mouth_right"],
- ["mouth_right", "mouth_left"],
- ["nose", "mouth_left"],
- ["left_elbow", "left_wrist"],
- ["left_shoulder", "left_elbow"],
- ["neck_center", "left_shoulder"],
- ["right_elbow", "right_wrist"],
- ["right_shoulder", "right_elbow"],
- ["neck_center", "right_shoulder"],
- ["left_hip", "left_knee"],
- ["left_knee", "left_ankle"],
- ["left_heel", "left_ankle"],
- ["left_ankle", "left_foot_index"],
- ["left_foot_index", "left_heel"],
- ["right_hip", "right_knee"],
- ["right_knee", "right_ankle"],
- ["right_heel", "right_ankle"],
- ["right_ankle", "right_foot_index"],
- ["right_foot_index", "right_heel"],
- ["hips_center", "left_hip"],
- ["hips_center", "right_hip"],
- ["hips_center", "neck_center"],
- ["neck_center", "head_center"],
- ["head_center", "nose"],
- # right hand
- ["right_wrist", "right_hand_index_finger_mcp"],
- ["right_wrist", "right_hand_middle_finger_mcp"],
- ["right_wrist", "right_hand_ring_finger_mcp"],
- ["right_wrist", "right_hand_pinky_finger_mcp"],
- ["right_wrist", "right_hand_thumb_cmc"],
- ["right_hand_thumb_cmc", "right_hand_thumb_mcp"],
- ["right_hand_thumb_mcp", "right_hand_thumb_ip"],
- ["right_hand_thumb_ip", "right_hand_thumb_tip"],
- ["right_hand_index_finger_mcp", "right_hand_index_finger_pip"],
- ["right_hand_index_finger_pip", "right_hand_index_finger_dip"],
- ["right_hand_index_finger_dip", "right_hand_index_finger_tip"],
- ["right_hand_middle_finger_mcp", "right_hand_middle_finger_pip"],
- ["right_hand_middle_finger_pip", "right_hand_middle_finger_dip"],
- ["right_hand_middle_finger_dip", "right_hand_middle_finger_tip"],
- ["right_hand_ring_finger_mcp", "right_hand_ring_finger_pip"],
- ["right_hand_ring_finger_pip", "right_hand_ring_finger_dip"],
- ["right_hand_ring_finger_dip", "right_hand_ring_finger_tip"],
- ["right_hand_pinky_finger_mcp", "right_hand_pinky_finger_pip"],
- ["right_hand_pinky_finger_pip", "right_hand_pinky_finger_dip"],
- ["right_hand_pinky_finger_dip", "right_hand_pinky_finger_tip"],
- # left hand
- ["left_wrist", "left_hand_thumb_cmc"],
- ["left_hand_thumb_cmc", "left_hand_thumb_mcp"],
- ["left_hand_thumb_mcp", "left_hand_thumb_ip"],
- ["left_hand_thumb_ip", "left_hand_thumb_tip"],
- ["left_wrist", "left_hand_index_finger_mcp"],
- ["left_wrist", "left_hand_middle_finger_mcp"],
- ["left_wrist", "left_hand_ring_finger_mcp"],
- ["left_wrist", "left_hand_pinky_finger_mcp"],
- ["left_hand_index_finger_mcp", "left_hand_index_finger_pip"],
- ["left_hand_index_finger_pip", "left_hand_index_finger_dip"],
- ["left_hand_index_finger_dip", "left_hand_index_finger_tip"],
- ["left_hand_middle_finger_mcp", "left_hand_middle_finger_pip"],
- ["left_hand_middle_finger_pip", "left_hand_middle_finger_dip"],
- ["left_hand_middle_finger_dip", "left_hand_middle_finger_tip"],
- ["left_hand_ring_finger_mcp", "left_hand_ring_finger_pip"],
- ["left_hand_ring_finger_pip", "left_hand_ring_finger_dip"],
- ["left_hand_ring_finger_dip", "left_hand_ring_finger_tip"],
- ["left_hand_pinky_finger_mcp", "left_hand_pinky_finger_pip"],
- ["left_hand_pinky_finger_pip", "left_hand_pinky_finger_dip"],
- ["left_hand_pinky_finger_dip", "left_hand_pinky_finger_tip"],
-]
-
-
-#################################################
-## FUNCTIONS - We'll define some functions here and use them later
-
-
-def create_keyframed_empty_from_3d_trajectory_data(
- trajectory_fr_xyz: np.ndarray,
- trajectory_name: str,
- parent_origin: bpy.types.Object = None,
- empty_scale: float = 0.1,
- empty_type: str = "PLAIN_AXES",
-):
- """
- Create a key framed empty from 3d trajectory data
- """
- print(f"Creating keyframed empty from: {trajectory_name}...")
- bpy.ops.object.empty_add(type=empty_type)
- empty_object = bpy.context.active_object
- empty_object.name = trajectory_name
-
- empty_object.scale = [empty_scale] * 3
-
- empty_object.parent = freemocap_origin_axes
-
- for frame_number in range(end_frame):
- empty_object.location = [
- trajectory_fr_xyz[frame_number, 0],
- trajectory_fr_xyz[frame_number, 1],
- trajectory_fr_xyz[frame_number, 2],
- ]
- bpy.context.view_layer.update()
-
- empty_object.keyframe_insert(data_path="location", frame=frame_number)
-
-
-def apply_constraints_to_bone(bone_name: str, bone_constraint_dict: dict, armature_rig):
- """
- Apply constraints to a bone (that exists in `armature_rig` based on a dictionary of constraints
- """
- for (
- constraint_name,
- constrain_parameters_dict,
- ) in bone_constraint_dict.items():
- constraint_name = constraint_name.split(".")[
- 0
- ] # for duplicated constraints, named `[constraint_name].001`, etc
- print(
- f"constraint: {constraint_name} with parameters:{constrain_parameters_dict}"
- )
-
- bone = armature_rig.pose.bones[bone_name]
- print(f"bone: {bone.name}")
-
- constraint = bone.constraints.new(type=constraint_name)
- print(f"constraint: {constraint.name}")
-
- # generic constraint settings
- if "target" in constrain_parameters_dict:
-
- if constrain_parameters_dict["target"] == "armature":
- constraint.target = armature_rig
- constraint.subtarget = constrain_parameters_dict["subtarget"]
- print(f"constraint.target: {constraint.target.name}")
- print(f"constraint.subtarget: {constraint.target.name}")
- else:
- constraint.target = bpy.data.objects[
- constrain_parameters_dict["target"]
- ] # point constraint at relevant empty object
- print(f"constraint.target: {constraint.target.name}")
-
- if "influence" in constrain_parameters_dict:
- constraint.influence = constrain_parameters_dict["influence"]
- print(f"constraint.influence: {constraint.influence}")
-
- # constraint-specific settings
- if constraint_name == "IK":
- constraint.chain_count = constrain_parameters_dict["chain_length"]
- print(f"constraint.chain_count: {constraint.chain_count}")
-
- if constraint_name == "LOCKED_TRACK":
- constraint.track_axis = constrain_parameters_dict["track_axis"]
- constraint.lock_axis = constrain_parameters_dict["lock_axis"]
- print(f"constraint.track_axis: {constraint.track_axis}")
- print(f"constraint.lock_axis: {constraint.lock_axis}")
-
- if constraint_name == "DAMPED_TRACK":
- if "track_axis" in constrain_parameters_dict:
- constraint.track_axis = constrain_parameters_dict["track_axis"]
- print(f"constraint.track_axis: {constraint.track_axis}")
-
-
-# Virtual marker stuff
-
-
-def test_virtual_marker_definitions(virtual_marker_definitions_dict: dict):
- """
- Validate the virtual marker definitions dictionary to ensure that there are the same number of marker names and weights, and that the weights sum to 1
- """
-
- for (
- virtual_marker_name,
- virtual_marker_definition,
- ) in virtual_marker_definitions_dict.items():
- assert len(virtual_marker_definition["marker_names"]) == len(
- virtual_marker_definition["marker_weights"]
- ), f"marker_names and marker_weights must be the same length for virtual marker {virtual_marker_name}"
- assert (
- sum(virtual_marker_definition["marker_weights"]) == 1
- ), f"marker_weights must sum to 1 for virtual marker {virtual_marker_name}"
-
-
-def create_virtual_marker(
- trajectory_3d_frame_marker_xyz: np.ndarray,
- all_trajectory_names: list,
- component_trajectory_names: List,
- trajectory_weights: List,
-) -> np.ndarray:
- """
- Create a virtual marker from a set of component markers. A 'Virtual Marker' is a 'fake' marker created by combining the data from 'real' (measured) marker/trajectory data
- `trajectory_3d_frame_marker_xyz`: all trajectory data in a numpy array with shape [frame, marker, xyz]
- `all_trajectory_names`: list of all trajectory names
- `component_trajectory_names`: the trajectories we'll use to make this virtual marker
- `trajectory_weights`: the weights we'll use to combine the compoenent trajectories into the virtual maker
- """
-
- # double check that the weights scale to one, otherwise this function will return screwy results
- assert np.sum(trajectory_weights) == 1, "Error - Trajectory_weights must sum to 1!"
-
- virtual_marker_xyz = np.zeros((trajectory_3d_frame_marker_xyz.shape[0], 3))
-
- for trajectory_number, trajectory_name in enumerate(component_trajectory_names):
- # pull out the trajectory data for this component trajectory
- component_trajectory_xyz = trajectory_3d_frame_marker_xyz[
- :, all_trajectory_names.index(trajectory_name), :
- ]
-
- # scale it by its weight
- component_trajectory_xyz *= trajectory_weights[trajectory_number]
-
- # add it to the virtual marker
- virtual_marker_xyz += component_trajectory_xyz
-
- return virtual_marker_xyz
-
-
-def put_sphere_meshes_on_empties(
- empty_names_list: list,
- parent_object: bpy.types.Object,
- sphere_scale: float = 0.02,
-):
- """
- put uv sphere meshes on the empties in `empty_names_list` with a scale of `sphere_scale`
- """
-
- for empty_name in empty_names_list:
- bpy.ops.mesh.primitive_uv_sphere_add(
- segments=8, ring_count=8, scale=(sphere_scale, sphere_scale, sphere_scale)
- )
- sphere = bpy.context.active_object
- sphere.name = f"{empty_name}_sphere"
- sphere.parent = parent_object
-
- constraint = sphere.constraints.new(type="COPY_LOCATION")
- constraint.target = bpy.data.objects[empty_name]
-
-
-def make_stick_figure_mesh(
- skel3d_frame_landmark_xyz: np.ndarray,
- stick_figure_mesh_edges: list,
- mediapipe_landmark_names: list,
- good_clean_frame_number: int,
-):
- """
- Create a stick figure mesh from a skeleton 3d data set
- `skel3d_frame_landmark_xyz`: skeleton 3d data set with shape [frame, landmark, xyz]
- `stick_figure_mesh_edge`: list of edges that make up the stick figure mesh
- `good_clean_frame_number`: the frame number to use for the stick figure mesh
- """
-
- # create a mesh
- mesh = bpy.data.meshes.new("stick_figure_mesh")
-
- # create a new object with the mesh
- stick_figure_mesh = bpy.data.objects.new("stick_figure_mesh", mesh)
-
- # get a reference to the scene
- scene = bpy.context.scene
-
- # link the object to the scene so it'll appear in the scene
- scene.collection.objects.link(stick_figure_mesh)
-
- # select the object
- stick_figure_mesh.select_set(True)
-
- # create the mesh from a list of verts/edges
- stick_figure_mesh_indicies = []
- for edge in stick_figure_mesh_edges:
- try:
- stick_figure_mesh_indicies.append(
- [
- mediapipe_landmark_names.index(edge[0]),
- mediapipe_landmark_names.index(edge[1]),
- ]
- )
- except Exception as e:
- print(e)
-
- mesh.from_pydata(
- skel3d_frame_landmark_xyz[good_clean_frame_number, :, :],
- stick_figure_mesh_indicies,
- [],
- )
-
- # update mesh with new data
- mesh.update(calc_edges=True)
-
- return stick_figure_mesh
-
-
-def find_good_clean_frame_reprojection_error_method(
- skeleton_3d_fr_mar_xyz: np.ndarray, skeleton_reprojection_error_fr_mar: np.ndarray
-):
- """
- Find the frame with the fewest nans, scaled by reprojection error (i.e. hopefully a frame where all tracked points are visible and well tracked)
- """
- print(
- "estimating good clean frame as the one where there few `nans`, reprojection error is low, and velocity is low..."
- )
-
- nans_per_frame = np.sum(np.isnan(skeleton_3d_fr_mar_xyz[:, :, 0]), axis=1)
- reprojection_error_per_frame = np.nanmedian(
- skeleton_reprojection_error_fr_mar, axis=1
- )
- marker_velocity_per_frame = np.nanmedian(
- np.abs(np.diff(skeleton_3d_fr_mar_xyz, axis=1)), axis=1
- )
- marker_velocity_per_frame = np.nanmean(np.abs(marker_velocity_per_frame), axis=1)
-
- print(f"nans_per_frame.shape: {nans_per_frame.shape}")
- print(f"reprojection_error_per_frame.shape: {reprojection_error_per_frame.shape}")
- print(f"marker_velocity_per_frame.shape: {marker_velocity_per_frame.shape}")
-
- # normalize errors by relevant thing
- nans_per_frame_normalized = nans_per_frame / skeleton_3d_fr_mar_xyz.shape[1]
- reprojection_error_per_frame_normalized = (
- reprojection_error_per_frame / np.nanmedian(reprojection_error_per_frame)
- )
- marker_velocity_per_frame_normalized = marker_velocity_per_frame / np.nanmedian(
- marker_velocity_per_frame
- )
-
- print(
- f"nans_per_frame_normalized (mean, [standard_deviation] : {np.nanmean(nans_per_frame_normalized):.3f} [{np.nanstd(nans_per_frame_normalized):.3f}]"
- )
- print(
- f"reprojection_error_per_frame_normalized (mean, [standard_deviation] : {np.nanmean(reprojection_error_per_frame_normalized):.3f} [{np.nanstd(reprojection_error_per_frame_normalized):.3f}]"
- )
- print(
- f"marker_velocity_per_frame_normalized (mean, [standard_deviation] : {np.nanmean(marker_velocity_per_frame_normalized):.3f} [{np.nanstd(marker_velocity_per_frame_normalized):.3f}]"
- )
-
- frame_cleanliness_score_where_low_scores_are_good = (
- nans_per_frame_normalized
- + reprojection_error_per_frame_normalized
- + marker_velocity_per_frame_normalized
- )
-
- good_clean_frame_number = np.nanargmin(
- frame_cleanliness_score_where_low_scores_are_good
- )
- print(f"----estimated good_clean_frame_number: {good_clean_frame_number}----")
- return good_clean_frame_number
-
-
-#######################################################################
-##% Activate necessary addons
-addon_utils.enable("io_import_images_as_planes")
-addon_utils.enable("rigify")
-
-#####################################################################
-###%% clear the scene - Scorch the earth \o/
-print("clearing scene")
-try:
- bpy.ops.object.mode_set(mode="OBJECT")
-except:
- pass
-
-try:
- bpy.ops.object.select_all(action="SELECT") # select all objects
- bpy.ops.object.delete(use_global=True) # delete all objects from all scenes
-except:
- pass
-
-##################
-### Getcher paths straight, lock and load yr data
-# path_to_data_folder = Path("/Users/jon/Dropbox/FreeMoCapProject/FreeMocap_Data/")
-
-print("Loading data....")
-# %% load mediapipe data
-# paths and whatnot
-if Path(session_path / "output_data").exists(): # freemocap version > v0.0.54
- path_to_data_arrays_folder = session_path / "output_data"
- path_to_body_npy = path_to_data_arrays_folder / "mediapipe_body_3d_xyz.npy"
- path_to_reprojection_error_npy = (
- path_to_data_arrays_folder
- / "raw_data"
- / "mediapipe_3dData_numFrames_numTrackedPoints_reprojectionError.npy"
- )
- mediapipe_skel_fr_mar_xyz = np.load(str(path_to_body_npy))
- mediapipe_reprojection_error_fr_mar = np.load(str(path_to_reprojection_error_npy))
-
-else:
- path_to_data_arrays_folder = (
- session_path / "DataArrays"
- ) # freemocap version <= v0.0.54
- if Path(
- path_to_data_arrays_folder / "mediapipe_body_3d_xyz.npy"
- ).exists(): # data has been 'post processed'
- path_to_body_npy = path_to_data_arrays_folder / "mediapipe_body_3d_xyz.npy"
- else:
- path_to_body_npy = (
- path_to_data_arrays_folder / "mediaPipeSkel_3d_smoothed.npy.npy"
- )
-
- path_to_reprojection_error_npy = (
- path_to_data_arrays_folder / "mediaPipeSkel_reprojErr.npy"
- )
-
- print(f"Loading mediapipe data from {path_to_body_npy}")
-
- mediapipe_skel_fr_mar_xyz = np.load(str(path_to_body_npy))
- mediapipe_reprojection_error_fr_mar = np.load(str(path_to_reprojection_error_npy))
-
- mediapipe_skel_fr_mar_xyz = mediapipe_skel_fr_mar_xyz[
- :, :33, :
- ] # remove the hand and face markers
- mediapipe_reprojection_error_fr_mar = mediapipe_reprojection_error_fr_mar[
- :, :33
- ] # remove the hand and face markers
-
-# load mediapipe skeleton data
-
-mediapipe_skel_fr_mar_xyz = mediapipe_skel_fr_mar_xyz / 1000 # convert to meters
-number_of_frames = mediapipe_skel_fr_mar_xyz.shape[0]
-print(f"mediapipe_skel_fr_mar_dim.shape: {mediapipe_skel_fr_mar_xyz.shape}")
-print(
- f"mediapipe_reprojection_error_fr_mar.shape: {mediapipe_reprojection_error_fr_mar.shape}"
-)
-
-# get video paths (running through all iterations of our folder names
-if Path(session_path / "annotated_videos").is_dir():
- video_folder_path = Path(session_path / "annotated_videos")
-elif Path(session_path / "synchronized_videos").is_dir():
- video_folder_path = session_path / "synchronized_videos"
-elif Path(session_path / "Annotated_Videos").is_dir():
- video_folder_path = session_path / "Annotated_Videos"
-elif Path(session_path / "SyncedVideos").is_dir():
- video_folder_path = session_path / "SyncedVideos"
-else:
- print("Couldn't find a video folder")
-
-# load skeleton segment lengths
-path_to_segment_length_json = (
- path_to_data_arrays_folder / "skeleton_segment_lengths.json"
-)
-try:
- print(
- f"loading skeleton segment lengths from `json` at - {str(path_to_segment_length_json)}"
- )
- f = open(path_to_segment_length_json)
- skeleton_segment_lengths_dict = json.load(f)
- f.close()
-except Exception as e:
- print(e)
- print(
- f"Failed to load skeleton segment lengths from `json` at : {str(path_to_segment_length_json)}"
- )
- skeleton_segment_lengths_dict = None
-
-#########################
-### Create Origin Axes
-
-bpy.ops.object.empty_add(type="ARROWS")
-world_origin_axes = bpy.context.active_object
-world_origin_axes.name = "world_origin" # will stay at origin
-
-bpy.ops.object.empty_add(type="ARROWS")
-freemocap_origin_axes = bpy.context.active_object
-freemocap_origin_axes.name = "freemocap_origin_axes" # will translate to put skelly on ground symmetric-ish about origin
-
-##############################
-# %% Set start and end frames
-
-start_frame = 1
-end_frame = number_of_frames
-
-if good_clean_frame_number == 0 or good_clean_frame_number is None:
- # estimate a good clean frame (ideally the T or A pose, but that's hard to pick out automatically)
- good_clean_frame_number = find_good_clean_frame_reprojection_error_method(
- skeleton_3d_fr_mar_xyz=mediapipe_skel_fr_mar_xyz,
- skeleton_reprojection_error_fr_mar=mediapipe_reprojection_error_fr_mar,
- )
-
-bpy.context.scene.frame_start = start_frame
-bpy.context.scene.frame_end = end_frame
-bpy.context.scene.frame_current = good_clean_frame_number
-
-############################
-### Load body data as empty markers
-empty_scale = 0.01
-for trajectory_name in mediapipe_body_trajectory_names:
- this_trajectory_fr_xyz = mediapipe_skel_fr_mar_xyz[
- :, mediapipe_body_trajectory_names.index(trajectory_name), :
- ]
- create_keyframed_empty_from_3d_trajectory_data(
- trajectory_fr_xyz=this_trajectory_fr_xyz,
- trajectory_name=trajectory_name,
- parent_origin=freemocap_origin_axes,
- empty_scale=0.01,
- empty_type="SPHERE",
- )
-
-#######################################################################
-# %% create virtual markers
-print("Creating virtual markers...")
-
-# verify that the virtual marker definition dictionary is valid
-test_virtual_marker_definitions(mediapipe_virtual_marker_definitions_dict)
-
-for (
- virtual_marker_name,
- virtual_marker_dict,
-) in mediapipe_virtual_marker_definitions_dict.items():
- print(
- f"Creating virtual marker: {virtual_marker_name}: "
- f"from 'real' markers: {virtual_marker_dict['marker_names']}, "
- f"with weights: {virtual_marker_dict['marker_weights']}"
- )
-
- mediapipe_body_trajectory_names.append(virtual_marker_name)
- virtual_marker_xyz = create_virtual_marker(
- trajectory_3d_frame_marker_xyz=mediapipe_skel_fr_mar_xyz,
- all_trajectory_names=mediapipe_body_trajectory_names,
- component_trajectory_names=virtual_marker_dict["marker_names"],
- trajectory_weights=virtual_marker_dict["marker_weights"],
- )
- create_keyframed_empty_from_3d_trajectory_data(
- trajectory_fr_xyz=virtual_marker_xyz,
- trajectory_name=virtual_marker_name,
- parent_origin=freemocap_origin_axes,
- empty_scale=empty_scale * 3,
- empty_type="PLAIN_AXES",
- )
-
-print("____________________________________________________________________________")
-print("Done loading in motion capture data - Now lets use it to drive an armature!")
-print("____________________________________________________________________________")
-
-######################
-### Create Rigify human meta-rig
-print(f"Creating `rigify human meta-rig`")
-bpy.ops.object.armature_human_metarig_add()
-human_metarig = bpy.context.active_object
-
-##################
-### Scale armature
-
-
-try:
- bpy.ops.object.mode_set(mode="EDIT")
-except:
- pass
-
-for (
- segment_name,
- rigify_bones_list,
-) in rigify_bone_to_skeleton_segment_name_correspondance.items():
-
- for rigify_bone_name in rigify_bones_list:
- median_segment_length = skeleton_segment_lengths_dict[segment_name]["median"]
- median_segment_length *= 0.001 # scale to meters
-
- segment_length = median_segment_length / len(
- rigify_bones_list
- ) # divide by number of bones in segment (for now, eventually will want to set weights
- print(f"setting {rigify_bone_name} length to: {segment_length:.3f} m")
- human_metarig.data.edit_bones[rigify_bone_name].length = segment_length
-
-####
-#### Constrain bones to empties
-####
-
-# loop through dictionary applying constraints
-try:
- bpy.ops.object.mode_set(mode="POSE")
-except:
- pass
-
-try:
- for bone_name, bone_constraint_dict in rig_constraint_dict_of_dicts.items():
- print(f"---Setting constraints for bone:{bone_name}---")
- apply_constraints_to_bone(
- bone_name=bone_name,
- bone_constraint_dict=bone_constraint_dict,
- armature_rig=human_metarig,
- )
-
-except Exception as e:
- print(e)
- print("Something went wrong applying constraints to armarture bones")
-
-print("____________________________________________________________________________")
-print("Done constraining armature bones to follow keyframed empties!")
-print("____________________________________________________________________________")
-
-####################
-## Create simple stick figure mesh
-
-print("____________________________________________________________________________")
-print("Creating simple stick figure mesh")
-print("____________________________________________________________________________")
-try:
- bpy.ops.object.mode_set(mode="OBJECT")
-except:
- pass
-put_sphere_meshes_on_empties(
- empty_names_list=mediapipe_body_trajectory_names,
- parent_object=freemocap_origin_axes,
- sphere_scale=0.02,
-)
-
-stick_figure_mesh = make_stick_figure_mesh(
- skel3d_frame_landmark_xyz=mediapipe_skel_fr_mar_xyz,
- stick_figure_mesh_edges=stick_figure_mesh_edges_list_of_lists,
- mediapipe_landmark_names=mediapipe_body_trajectory_names,
- good_clean_frame_number=good_clean_frame_number,
-)
-
-#####################
-## Load nSynched Videos
-try:
- print("loading videos as planes...")
-
- world_origin = bpy.data.objects["world_origin"]
-
- number_of_videos = len(list(video_folder_path.glob("*.mp4")))
-
- vid_location_scale = 1
-
- for (
- vid_number,
- thisVidPath,
- ) in enumerate(video_folder_path.glob("*.mp4")):
- print(thisVidPath)
- # use 'images as planes' add on to load in the video files as planes
- bpy.ops.import_image.to_plane(
- files=[{"name": thisVidPath.name}],
- directory=str(thisVidPath.parent),
- shader="EMISSION",
- )
- this_vid_as_plane = bpy.context.active_object
- this_vid_as_plane.name = "vid_" + str(vid_number)
-
- vid_x = (vid_number - number_of_videos / 2) * vid_location_scale
-
- this_vid_as_plane.location = [
- vid_x,
- vid_location_scale,
- vid_location_scale,
- ]
- this_vid_as_plane.rotation_euler = [np.pi / 2, 0, 0]
- this_vid_as_plane.scale = [vid_location_scale * 1.5] * 3
- this_vid_as_plane.parent = world_origin
- # create a light
- # bpy.ops.object.light_add(type='POINT', radius=1, align='WORLD')
-except Exception as e:
- print(e)
- print(
- 'Failed to load videos to Blender scene - You might need to install the "images as planes" addon to this version of Blender'
- )
-
-try:
- # from https://blender.stackexchange.com/a/238223
-
- for window in bpy.context.window_manager.windows:
- for area in window.screen.areas: # iterate through areas in current screen
- if area.type == "VIEW_3D":
- for (
- space
- ) in area.spaces: # iterate through spaces in current VIEW_3D area
- if space.type == "VIEW_3D": # check if space is a 3D view
- space.shading.type = "MATERIAL"
-except Exception as e:
- print(e)
- print("Failed to set shading to material")
-
-# save .blend file
-sessionID = session_path.stem
-blend_file_save_path = session_path / (sessionID + ".blend")
-
-bpy.ops.wm.save_as_mainfile(filepath=str(blend_file_save_path))
-
-print("____________________________________________________________________________")
-print("____________________________________________________________________________")
-print(
- "Done creating Blender scene!\n",
- f"Saved .blend file to: {blend_file_save_path}\n",
- "You can now open the `.blend` file in Blender and play the animation!\n",
-)
-print("____________________________________________________________________________")
-print("____________________________________________________________________________")
diff --git a/src/blender_stuff/create_blend_file_from_session_data.py b/src/blender_stuff/create_blend_file_from_session_data.py
deleted file mode 100644
index 958954af..00000000
--- a/src/blender_stuff/create_blend_file_from_session_data.py
+++ /dev/null
@@ -1,67 +0,0 @@
-import subprocess
-from pathlib import Path
-from typing import Union
-
-from src.config.home_dir import get_session_folder_path
-
-# blender_exe_path = (
-# r"C:\Users\jonma\Blender Foundation\stable\blender-3.1.0-windows-x64\blender.exe"
-# )
-# blender_exe_path = r"C:\Users\jonma\Blender Foundation\Blender 3.1\blender.exe"
-
-import logging
-
-logger = logging.getLogger(__name__)
-
-
-def create_blend_file_from_session_data(
- session_folder_path: Union[str, Path],
- blender_exe_path: Union[str, Path],
- good_clean_frame_number: int = 0,
-):
- path_to_this_py_file = Path(__file__).parent.resolve()
-
- freemocap_blender_megascript_path = (
- path_to_this_py_file / "alpha_freemocap_blender_megascript.py"
- )
-
- # freemocap_blender_megascript_path = (
- # path_to_this_py_file / "bind_rigify_meta_rig_to_freemocap_data.py"
- # )
-
- try:
- blender_exe_path = Path(blender_exe_path)
- if not blender_exe_path.exists():
- raise FileNotFoundError(
- f"Could not find the blender executable at {blender_exe_path}"
- )
- except Exception as e:
- logger.error(e)
- return
-
- command_list = [
- str(blender_exe_path),
- "--background",
- "--python",
- str(freemocap_blender_megascript_path),
- "--",
- str(session_folder_path),
- str(good_clean_frame_number),
- ]
-
- logger.info(f"Starting `blender` sub-process with this command: \n {command_list}")
-
- blender_process = subprocess.Popen(
- command_list, shell=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE
- )
- while True:
- output = blender_process.stdout.readline()
- if blender_process.poll() is not None:
- break
- if output:
- print(output.strip().decode())
-
- if blender_process.returncode == 0:
- print("Blender returned an error:")
- print(blender_process.stderr.read().decode())
- logger.info(f"Done with blender stuff :D")
diff --git a/src/blender_stuff/export_to_blender.py b/src/blender_stuff/export_to_blender.py
deleted file mode 100644
index 026c0b74..00000000
--- a/src/blender_stuff/export_to_blender.py
+++ /dev/null
@@ -1,33 +0,0 @@
-from pathlib import Path
-from typing import Union
-
-
-from src.blender_stuff.create_blend_file_from_session_data import (
- create_blend_file_from_session_data,
-)
-import logging
-
-logger = logging.getLogger(__name__)
-
-
-def export_to_blender(
- session_folder_path: Union[str, Path], blender_exe_path: Union[str, Path]
-):
-
- blender_file_name = Path(session_folder_path).stem + ".blend"
- blender_file_path = Path(session_folder_path) / blender_file_name
- logger.info(
- f"Exporting session data to a Blender scene at: {str(blender_file_path)}"
- )
-
- create_blend_file_from_session_data(
- session_folder_path=session_folder_path, blender_exe_path=blender_exe_path
- )
-
- return str(blender_file_path)
-
-
-if __name__ == "__main__":
- from src.config.home_dir import get_most_recent_session_id
-
- export_to_blender(get_most_recent_session_id())
diff --git a/src/blender_stuff/load_npy_as_empties.py b/src/blender_stuff/load_npy_as_empties.py
deleted file mode 100644
index 23974b88..00000000
--- a/src/blender_stuff/load_npy_as_empties.py
+++ /dev/null
@@ -1,115 +0,0 @@
-import bpy
-import numpy as np
-from mathutils import Vector
-from pathlib import Path
-
-try:
- import pandas as pd
- import numpy as np
-except:
- import sys
- import os
- import subprocess
-
- python_exe = os.path.join(sys.prefix, "bin", "python.exe")
-
- subprocess.call([python_exe, "-m", "ensurepip"])
- subprocess.call([python_exe, "-m", "pip", "install", "--upgrade", "pip"])
- subprocess.call([python_exe, "-m", "pip", "install", "--upgrade", "pandas"])
- subprocess.call([python_exe, "-m", "pip", "install", "--upgrade", "numpy"])
- import pandas as pd
- import numpy as np
-
-mediapipe_body_trajectory_names = [
- "nose",
- "left_eye_inner",
- "left_eye",
- "left_eye_outer",
- "right_eye_inner",
- "right_eye",
- "right_eye_outer",
- "left_ear",
- "right_ear",
- "mouth_left",
- "mouth_right",
- "left_shoulder",
- "right_shoulder",
- "left_elbow",
- "right_elbow",
- "left_wrist",
- "right_wrist",
- "left_pinky",
- "right_pinky",
- "left_index",
- "right_index",
- "left_thumb",
- "right_thumb",
- "left_hip",
- "right_hip",
- "left_knee",
- "right_knee",
- "left_ankle",
- "right_ankle",
- "left_heel",
- "right_heel",
- "left_foot_index",
- "right_foot_index",
-]
-
-
-def create_keyframed_empty_from_3d_trajectory_data(
- trajectory_fr_xyz: np.ndarray,
- parent_origin: bpy.types.Object = None,
- empty_scale: float = 0.0251,
- empty_type: str = "SPHERE",
- empty_name: str = None,
-):
- """
- Create a key framed empty from 3d trajectory data
- """
-
- bpy.ops.object.empty_add(type=empty_type)
- empty_object = bpy.context.active_object
-
- empty_object.scale = [empty_scale] * 3
-
- if parent_origin is not None:
- empty_object.parent = parent_origin
-
- if empty_name is not None:
- empty_object.name = empty_name
-
- for frame_number in range(trajectory_fr_xyz.shape[0]):
- empty_object.location = [
- trajectory_fr_xyz[frame_number, 0],
- trajectory_fr_xyz[frame_number, 1],
- trajectory_fr_xyz[frame_number, 2],
- ]
- bpy.context.view_layer.update()
-
- empty_object.keyframe_insert(data_path="location", frame=frame_number)
-
-
-og_npy_path = "D:\Dropbox\FreeMoCapProject\FreeMocap_Data\sesh_2022-11-09_20_38_23_neurons_demo\DataArrays\mediapipe_body_3d_xyz_blender_rotated.npy"
-og_skel = np.load(og_npy_path) / 1000
-rot_skel = og_skel.copy()
-
-# og_csv_path = "D:\Dropbox\FreeMoCapProject\FreeMocap_Data\sesh_2022-11-09_20_38_23_neurons_demo\DataArrays\mediapipe_body_3d_xyz.csv"
-# of_skel_df = pd.read_csv(og_csv_path)
-
-
-bpy.ops.object.empty_add(type="ARROWS")
-freemocap_axes = bpy.context.active_object
-freemocap_axes.name = "freemocap_origin_axes" # will translate to put skelly on ground symmetric-ish about origin
-
-for marker_name, marker_number in zip(
- mediapipe_body_trajectory_names, range(og_skel.shape[1])
-):
- create_keyframed_empty_from_3d_trajectory_data(
- og_skel[:, marker_number, :],
- parent_origin=freemocap_axes,
- empty_name=marker_name,
- )
-
-
-bpy.context.scene.frame_end = og_skel.shape[0]
diff --git a/src/blender_stuff/old/OLD_bind_mixamo_skeleton_to_freemocap_empties.py b/src/blender_stuff/old/OLD_bind_mixamo_skeleton_to_freemocap_empties.py
deleted file mode 100644
index b621256d..00000000
--- a/src/blender_stuff/old/OLD_bind_mixamo_skeleton_to_freemocap_empties.py
+++ /dev/null
@@ -1,113 +0,0 @@
-import bpy
-
-
-print(" - Starting (alpha) blender megascript - ")
-
-
-rig_name = "mixamorig"
-rig_constraint_dict_of_dicts_og = {
- "Hips": {
- "COPY_LOCATION": "hip_center",
- "STRETCH_TO": "chest_center",
- },
- "Spine1": {
- "STRETCH_TO": "chest_center",
- },
- "RightShoulder": {
- "COPY_LOCATION": "neck_center",
- "STRETCH_TO": "right_shoulder",
- },
- "LeftShoulder": {
- "COPY_LOCATION": "neck_center",
- "STRETCH_TO": "left_shoulder",
- },
- "RightArm": {
- "STRETCH_TO": "right_elbow",
- },
- "LeftArm": {
- "STRETCH_TO": "left_elbow",
- },
- "RightForeArm": {
- "STRETCH_TO": "right_wrist",
- },
- "LeftForeArm": {
- "STRETCH_TO": "left_wrist",
- },
- "RightHand": {
- "STRETCH_TO": "left_hand_wrist",
- },
- "LeftHand": {
- "STRETCH_TO": "right_hand_wrist",
- },
- "Neck": {
- "STRETCH_TO": "head_center",
- },
- "RightUpLeg": {
- "COPY_LOCATION": "right_hip",
- "STRETCH_TO": "right_knee",
- },
- "LeftUpLeg": {
- "COPY_LOCATION": "left_hip",
- "STRETCH_TO": "left_knee",
- },
- "RightLeg": {
- "STRETCH_TO": "right_ankle",
- },
- "LeftLeg": {
- "STRETCH_TO": "left_ankle",
- },
- "RightFoot": {
- "DAMPED_TRACK": "right_foot_index",
- },
- "LeftFoot": {
- "DAMPED_TRACK": "left_foot_index",
- },
- "RightToeBase": {
- "STRETCH_TO": "right_foot_index",
- },
- "LeftToeBase": {
- "STRETCH_TO": "left_foot_index",
- },
- "Head": {
- "COPY_LOCATION": "head_center",
- "DAMPED_TRACK": "head_center",
- },
-}
-
-
-### Pre-pend `rig_name` or whatever to bone names
-rig_constraint_dict_of_dicts = {}
-for key in rig_constraint_dict_of_dicts_og.keys():
- rig_constraint_dict_of_dicts[f"{rig_name}{key}"] = rig_constraint_dict_of_dicts_og[
- key
- ]
-
-####
-#### Constrain bones to empties
-####
-armature_name = "Armature"
-armature = bpy.data.objects[armature_name]
-# loop through dictionary applying constraints
-try:
- bpy.ops.object.mode_set(mode="POSE")
-except:
- pass
-
-for this_bone_name, this_bone_dict in rig_constraint_dict_of_dicts.items():
- print(f"---Setting constraints for bone:{this_bone_name}---")
-
- for (
- this_constraint_name,
- this_constraint_target_empty_name,
- ) in this_bone_dict.items():
- print(
- f"constraint: {this_constraint_name} with target:{this_constraint_target_empty_name}"
- )
- print("grab bone")
- this_bone = armature.pose.bones[this_bone_name]
- print("apply bone")
- this_constraint = this_bone.constraints.new(type=this_constraint_name)
- this_constraint.name = this_constraint_name
- this_constraint.target = bpy.data.objects[
- this_constraint_target_empty_name
- ] # point constraint at relevant empty object
diff --git a/src/blender_stuff/old/bind_mixamo_rig_to_freemocap_mocap_data.py b/src/blender_stuff/old/bind_mixamo_rig_to_freemocap_mocap_data.py
deleted file mode 100644
index d44a0d22..00000000
--- a/src/blender_stuff/old/bind_mixamo_rig_to_freemocap_mocap_data.py
+++ /dev/null
@@ -1,445 +0,0 @@
-import bpy
-import numpy as np
-from pathlib import Path
-import json
-
-#####################################################################
-###%% clear the scene - Scorch the earth \o/
-print("clearing scene")
-try:
- bpy.ops.object.mode_set(mode="OBJECT")
-except:
- pass
-
-try:
- bpy.ops.object.select_all(action="SELECT") # select all objects
- bpy.ops.object.delete(use_global=True) # delete all objects from all scenes
-except:
- pass
-
-##################
-### Getcher paths straight
-path_to_data_folder = Path("/Users/jon/Dropbox/FreeMoCapProject/FreeMocap_Data/")
-# path_to_data_folder = Path("D:\Dropbox\FreeMoCapProject\FreeMocap_Data")
-
-session_id = "sesh_2022-09-19_16_16_50_in_class_jsm"
-
-session_path = path_to_data_folder / session_id
-path_to_data_arrays_folder = session_path / "DataArrays"
-path_to_body_npy = path_to_data_arrays_folder / "mediapipe_body_3d_xyz.npy"
-
-annotated_videos_path = session_path / "annotated_videos"
-
-if annotated_videos_path.is_dir():
- vidFolderPath = annotated_videos_path
-else:
- vidFolderPath = session_path / "synchronized_videos"
-
-path_to_segment_length_json = (
- path_to_data_arrays_folder / "skeleton_segment_lengths.json"
-)
-print(f" json path - {str(path_to_segment_length_json)}")
-f = open(path_to_segment_length_json)
-skeleton_segment_lengths_dict = json.load(f)
-
-path_to_mixamo_fbx = r"/Users/jon/Dropbox/FreeMoCapProject/teddy_animation/mixamo_binding_stuff/mixamo_mannequin_fbx_Ch36_nonPBR.fbx"
-# path_to_mixamo_fbx = r"D:\Dropbox\FreeMoCapProject\teddy_animation\mixamo_binding_stuff\mixamo_mannequin_fbx_Ch36_nonPBR.fbx"
-
-#########################
-### Create Origin Axes
-
-bpy.ops.object.empty_add(type="ARROWS")
-world_origin_axes = bpy.context.active_object
-world_origin_axes.name = "world_origin" # will stay at origin
-
-bpy.ops.object.empty_add(type="ARROWS")
-freemocap_origin_axes = bpy.context.active_object
-freemocap_origin_axes.name = "freemocap_origin_axes" # will translate to put skelly on ground symmetric-ish about origin
-
-#####################
-## Load nSynched Videos
-try:
- print("loading videos as planes...")
-
- world_origin = bpy.data.objects["world_origin"]
-
- number_of_videos = len(list(vidFolderPath.glob("*.mp4")))
-
- vid_location_scale = 1
-
- for (
- vid_number,
- thisVidPath,
- ) in enumerate(vidFolderPath.glob("*.mp4")):
- print(thisVidPath)
- # use 'images as planes' add on to load in the video files as planes
- bpy.ops.import_image.to_plane(
- files=[{"name": thisVidPath.name}],
- directory=str(thisVidPath.parent),
- shader="EMISSION",
- )
- this_vid_as_plane = bpy.context.active_object
- this_vid_as_plane.name = "vid_" + str(vid_number)
-
- vid_x = (vid_number - number_of_videos / 2) * vid_location_scale
-
- this_vid_as_plane.location = [
- vid_x,
- vid_location_scale,
- vid_location_scale,
- ]
- this_vid_as_plane.rotation_euler = [np.pi / 2, 0, 0]
- this_vid_as_plane.scale = [vid_location_scale * 1.5] * 3
- this_vid_as_plane.parent = world_origin
- # create a light
- # bpy.ops.object.light_add(type='POINT', radius=1, align='WORLD')
-except Exception as e:
- print(e)
- print(
- 'Failed to load videos to Blender scene - You might need to install the "images as planes" addon to this version of Blender'
- )
-
-############
-## Mediapipe Tracked Point Names
-
-
-mediapipe_body_names = [
- "nose",
- "left_eye_inner",
- "left_eye",
- "left_eye_outer",
- "right_eye_inner",
- "right_eye",
- "right_eye_outer",
- "left_ear",
- "right_ear",
- "mouth_left",
- "mouth_right",
- "left_shoulder",
- "right_shoulder",
- "left_elbow",
- "right_elbow",
- "left_wrist",
- "right_wrist",
- "left_pinky",
- "right_pinky",
- "left_index",
- "right_index",
- "left_thumb",
- "right_thumb",
- "left_hip",
- "right_hip",
- "left_knee",
- "right_knee",
- "left_ankle",
- "right_ankle",
- "left_heel",
- "right_heel",
- "left_foot_index",
- "right_foot_index",
-]
-
-#######################################################################
-# %% load mediapipe data
-# %%
-print("loading data")
-# %%
-
-
-mediapipe_skel_fr_mar_dim = np.load(str(path_to_body_npy))
-mediapipe_skel_fr_mar_dim = mediapipe_skel_fr_mar_dim / 1000 # convert to meters
-
-print(f"mediapipe_skel_fr_mar_dim.shape: {mediapipe_skel_fr_mar_dim.shape}")
-
-##############################
-# %% Set start and end frames
-number_of_frames = mediapipe_skel_fr_mar_dim.shape[0]
-start_frame = 1
-end_frame = number_of_frames
-
-bpy.context.scene.frame_start = start_frame
-bpy.context.scene.frame_end = end_frame
-
-############################
-### Load body data as empty markers
-
-
-empty_size = 0.01
-
-for this_point_index, this_point_name in enumerate(mediapipe_body_names):
- print(f"loading {this_point_name}...")
- bpy.ops.object.empty_add(type="SPHERE")
- this_empty = bpy.context.active_object
- this_empty.name = this_point_name
-
- this_empty.scale = [empty_size] * 3
-
- this_empty.parent = freemocap_origin_axes
-
- this_point_fr_xyz = mediapipe_skel_fr_mar_dim[:, this_point_index, :]
-
- for frame_num in range(end_frame):
- this_empty.location = [
- this_point_fr_xyz[frame_num, 0],
- this_point_fr_xyz[frame_num, 1],
- this_point_fr_xyz[frame_num, 2],
- ]
- bpy.context.view_layer.update()
-
- this_empty.keyframe_insert(data_path="location", frame=frame_num)
-
-#######################################################################
-# %% create virtual markers
-print("creating virtual markers")
-
-left_ear_index = 7
-right_ear_index = 8
-print("head_center - midway between left and right ears")
-head_xyz = (
- mediapipe_skel_fr_mar_dim[:, left_ear_index, :]
- + mediapipe_skel_fr_mar_dim[:, right_ear_index, :]
-) / 2
-bpy.ops.object.empty_add(type="SPHERE")
-this_empty = bpy.context.active_object
-this_empty.name = "head_center"
-this_empty.scale = [empty_size] * 3
-this_empty.parent = freemocap_origin_axes
-
-for frame_num in range(end_frame):
- this_empty.location = [
- head_xyz[frame_num, 0],
- head_xyz[frame_num, 1],
- head_xyz[frame_num, 2],
- ]
- this_empty.keyframe_insert(data_path="location", frame=frame_num)
-
-print("neck_center - midway between left and right shoulders")
-left_shoulder_index = 11
-right_shoulder_index = 12
-neck_xyz = (
- mediapipe_skel_fr_mar_dim[:, left_shoulder_index, :]
- + mediapipe_skel_fr_mar_dim[:, right_shoulder_index, :]
-) / 2
-bpy.ops.object.empty_add(type="PLAIN_AXES")
-this_empty = bpy.context.active_object
-this_empty.name = "neck_center"
-this_empty.scale = [empty_size] * 3
-this_empty.parent = freemocap_origin_axes
-
-for frame_num in range(end_frame):
- this_empty.location = [
- neck_xyz[frame_num, 0],
- neck_xyz[frame_num, 1],
- neck_xyz[frame_num, 2],
- ]
- this_empty.keyframe_insert(data_path="location", frame=frame_num)
-
-print("hip_center - midway between left and right hips")
-left_hip_index = 23
-right_hip_index = 24
-hips_xyz = (
- mediapipe_skel_fr_mar_dim[:, left_hip_index, :]
- + mediapipe_skel_fr_mar_dim[:, right_hip_index, :]
-) / 2
-bpy.ops.object.empty_add(type="PLAIN_AXES")
-this_empty = bpy.context.active_object
-this_empty.name = "hip_center"
-this_empty.scale = [empty_size] * 3
-this_empty.parent = freemocap_origin_axes
-
-for frame_num in range(end_frame):
- this_empty.location = [
- hips_xyz[frame_num, 0],
- hips_xyz[frame_num, 1],
- hips_xyz[frame_num, 2],
- ]
- this_empty.keyframe_insert(data_path="location", frame=frame_num)
-
-print("chest_center - midway between hips and neck centers")
-
-chest_xyz = (hips_xyz + neck_xyz) / 2
-bpy.ops.object.empty_add(type="PLAIN_AXES")
-this_empty = bpy.context.active_object
-this_empty.name = "chest_center"
-this_empty.scale = [empty_size] * 3
-this_empty.parent = freemocap_origin_axes
-
-for frame_num in range(end_frame):
- this_empty.location = [
- chest_xyz[frame_num, 0],
- chest_xyz[frame_num, 1],
- chest_xyz[frame_num, 2],
- ]
- this_empty.keyframe_insert(data_path="location", frame=frame_num)
-
-######################
-### Load Mixamo Armature
-print(f"Loading Mixamo rigged mesh from: {path_to_mixamo_fbx}")
-bpy.ops.import_scene.fbx(filepath=path_to_mixamo_fbx, use_anim=False)
-bpy.ops.object.transform_apply(location=True, rotation=True, scale=True)
-armature_name = "Armature"
-armature = bpy.data.objects[armature_name]
-
-freemocap_origin_axes.rotation_euler[2] = np.pi
-##################
-### Scale armature
-
-rig_name = "mixamorig1"
-mixamo_bone_to_skeleton_segment_name_correspondance = {
- "lower_spine": ["Hips", "Spine"],
- "upper_spine": ["Spine1", "Spine2"],
- "head": ["Neck", "Head"],
- "left_upper_arm": ["LeftArm"],
- "left_forearm": ["LeftForeArm"],
- "left_hand": ["LeftHand"],
- "right_upper_arm": ["RightArm"],
- "right_forearm": ["RightForeArm"],
- "right_hand": ["RightHand"],
- "left_thigh": ["LeftUpLeg"],
- "left_calf": ["LeftLeg"],
- "left_foot": ["LeftFoot"],
- "right_thigh": ["RightUpLeg"],
- "right_calf": ["RightLeg"],
- "right_foot": ["RightFoot"],
-}
-
-try:
- bpy.ops.object.mode_set(mode="EDIT")
-except:
- pass
-
-for (
- segment_name,
- mixamo_bones_list,
-) in mixamo_bone_to_skeleton_segment_name_correspondance.items():
- print(
- f"segment: {segment_name}, length: {skeleton_segment_lengths_dict[segment_name]['median']}mm"
- )
-
- for mixamo_bone in mixamo_bones_list:
- segment_length = (
- skeleton_segment_lengths_dict[segment_name]["median"]
- / len(mixamo_bones_list)
- ) * 0.001
- print(f"setting: {mixamo_bone} length to: {segment_length} m")
- armature.data.edit_bones[f"{rig_name}:{mixamo_bone}"].length = segment_length
-
- ####################
-#### get segment lengths
-
-########################
-### Constrain mixamo bones to track empty locations
-
-
-rig_constraint_dict_of_dicts_og = {
- "Hips": {
- "COPY_LOCATION": "hip_center",
- },
- "Spine": {
- "IK": "chest_center",
- },
- "Spine1": {
- "COPY_LOCATION": "chest_center",
- },
- "Spine2": {
- "IK": "neck_center",
- },
- "Neck": {
- "COPY_LOCATION": "neck_center",
- },
- "Head": {
- "IK": "head_center",
- },
- "RightShoulder": {
- "COPY_LOCATION": "neck_center",
- "DAMPED_TRACK": "right_shoulder",
- },
- "RightArm": {
- "COPY_LOCATION": "right_shoulder",
- "DAMPED_TRACK": "right_elbow",
- },
- "RightForeArm": {
- "COPY_LOCATION": "right_elbow",
- "DAMPED_TRACK": "right_wrist",
- },
- "RightHand": {
- "COPY_LOCATION": "right_wrist",
- "DAMPED_TRACK": "right_index",
- },
- "LeftShoulder": {
- "COPY_LOCATION": "neck_center",
- "DAMPED_TRACK": "left_shoulder",
- },
- "LeftArm": {
- "COPY_LOCATION": "left_shoulder",
- "DAMPED_TRACK": "left_elbow",
- },
- "LeftForeArm": {
- "COPY_LOCATION": "left_elbow",
- "DAMPED_TRACK": "left_wrist",
- },
- "LeftHand": {
- "COPY_LOCATION": "left_wrist",
- "DAMPED_TRACK": "left_index",
- },
- "RightUpLeg": {
- "COPY_LOCATION": "right_hip",
- "DAMPED_TRACK": "right_knee",
- },
- "RightLeg": {
- "COPY_LOCATION": "right_knee",
- "DAMPED_TRACK": "right_ankle",
- },
- "RightFoot": {
- "COPY_LOCATION": "right_ankle",
- "DAMPED_TRACK": "right_foot_index",
- },
- "LeftUpLeg": {
- "COPY_LOCATION": "left_hip",
- "DAMPED_TRACK": "left_knee",
- },
- "LeftLeg": {
- "COPY_LOCATION": "left_knee",
- "DAMPED_TRACK": "left_ankle",
- },
- "LeftFoot": {
- "COPY_LOCATION": "left_ankle",
- "DAMPED_TRACK": "left_foot_index",
- },
-}
-
-### Pre-pend `rig_name` or whatever to bone names
-rig_constraint_dict_of_dicts = {}
-for key in rig_constraint_dict_of_dicts_og.keys():
- rig_constraint_dict_of_dicts[f"{rig_name}:{key}"] = rig_constraint_dict_of_dicts_og[
- key
- ]
-
-####
-#### Constrain bones to empties
-####
-
-# loop through dictionary applying constraints
-try:
- bpy.ops.object.mode_set(mode="POSE")
-except:
- pass
-
-for this_bone_name, this_bone_dict in rig_constraint_dict_of_dicts.items():
- print(f"---Setting constraints for bone:{this_bone_name}---")
-
- for (
- this_constraint_name,
- this_constraint_target_empty_name,
- ) in this_bone_dict.items():
- print(
- f"constraint: {this_constraint_name} with target:{this_constraint_target_empty_name}"
- )
- print("grab bone")
- this_bone = armature.pose.bones[this_bone_name]
- print("apply bone")
- this_constraint = this_bone.constraints.new(type=this_constraint_name)
- this_constraint.name = this_constraint_name
- this_constraint.target = bpy.data.objects[
- this_constraint_target_empty_name
- ] # point constraint at relevant empty object
diff --git a/src/cameras/capture/dataclasses/frame_payload.py b/src/cameras/capture/dataclasses/frame_payload.py
deleted file mode 100644
index 30b38030..00000000
--- a/src/cameras/capture/dataclasses/frame_payload.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from typing import NamedTuple, Union
-
-import numpy as np
-
-
-class FramePayload(NamedTuple):
- success: bool = False
- image: np.ndarray = None
- timestamp_in_seconds_from_record_start: float = None
- timestamp_unix_time_seconds: float = None
- frame_number: int = None
- webcam_id: str = None
diff --git a/src/cameras/capture/opencv_camera/camera_stream_thread_handler.py b/src/cameras/capture/opencv_camera/camera_stream_thread_handler.py
deleted file mode 100644
index 17791e48..00000000
--- a/src/cameras/capture/opencv_camera/camera_stream_thread_handler.py
+++ /dev/null
@@ -1,83 +0,0 @@
-import logging
-import threading
-import time
-import traceback
-from typing import List
-
-import numpy as np
-
-from src.cameras.capture.dataclasses.frame_payload import FramePayload
-
-logger = logging.getLogger(__name__)
-
-
-class VideoCaptureThread(threading.Thread):
- def __init__(
- self,
- get_next_frame,
- webcam_id: str = "unknown",
- ):
- super().__init__()
- self._webcam_id = webcam_id
- self._is_capturing_frames = False
- self._is_recording_frames = False
- self._get_next_frame = get_next_frame
- self._num_frames_processed = 0
- self._elapsed_during_frame_grab = []
- self._timestamps_npy = []
- self._median_framerate = None
- self._frame: FramePayload = FramePayload()
- self._frame_list = []
- self.setDaemon(True)
-
- @property
- def median_framerate(self):
- if self._num_frames_processed == 0:
- logger.warning(
- f"No Frames processed yet, cannot calculate median_framerate"
- )
- else:
- self._median_framerate = np.nanmedian(
- (np.diff(self._timestamps_npy) ** -1) / 1e9
- )
-
- return self._median_framerate
-
- @property
- def latest_frame(self) -> FramePayload:
- return self._frame
-
- @property
- def frame_list(self) -> List:
- return self._frame_list
-
- @property
- def is_capturing_frames(self) -> bool:
- """Is the thread capturing frames from the cameras (but not necessarily recording them, that's handled by `is_recording_frames`)"""
- return self._is_capturing_frames
-
- def stop(self):
- self._is_capturing_frames = False
-
- def run(self):
- self._start_frame_loop()
-
- def _start_frame_loop(self):
- self._is_capturing_frames = True
- logger.info(f"Starting frame loop for {self._webcam_id}")
- try:
- while self._is_capturing_frames:
-
- self._frame = self._get_next_frame()
- self._timestamps_npy.append(
- self._frame.timestamp_in_seconds_from_record_start
- )
- self._num_frames_processed += 1
- # logger.debug(
- # f"Camera {self._webcam_id}: captured frame# {self._num_frames_processed}"
- # )
- except:
- logger.error("Frame loop thread exited due to error")
- traceback.print_exc()
- else:
- logger.info("Frame loop thread exited.")
diff --git a/src/cameras/capture/opencv_camera/opencv_camera.py b/src/cameras/capture/opencv_camera/opencv_camera.py
deleted file mode 100644
index a5a5c37b..00000000
--- a/src/cameras/capture/opencv_camera/opencv_camera.py
+++ /dev/null
@@ -1,271 +0,0 @@
-import asyncio
-import logging
-import platform
-import time
-import traceback
-
-import cv2
-
-from src.cameras.capture.dataclasses.frame_payload import FramePayload
-from src.cameras.viewer.cv_cam_viewer import CvCamViewer
-from src.cameras.webcam_config import WebcamConfig
-from src.cameras.capture.opencv_camera.camera_stream_thread_handler import (
- VideoCaptureThread,
-)
-
-logger = logging.getLogger(__name__)
-
-
-class OpenCVCamera:
- """
- Performant implementation of video start against webcams
- """
-
- def __init__(
- self,
- config: WebcamConfig,
- session_start_time_perf_counter_ns: int = 0,
- calibration_video_bool: bool = False,
- ):
- self._config = config
- self._name = f"Camera_{self._config.webcam_id}"
- self._opencv_video_capture_object: cv2.VideoCapture = None
- self._running_thread: VideoCaptureThread = None
- self._new_frame_ready = False
- self._number_of_frames_recorded = 0
- self._calibration_video_bool = calibration_video_bool
- self._session_start_time_perf_counter_ns = session_start_time_perf_counter_ns
-
- @property
- def new_frame_ready(self):
- """
- can be called to determine if the frame returned from `self.latest_frame` is new or if it has been called before
- """
- return self._new_frame_ready
-
- @property
- def video_recorder(self):
- return self._video_recorder
-
- @property
- def name(self):
- return self._name
-
- @property
- def webcam_id_as_str(self) -> str:
- return str(self._config.webcam_id)
-
- @property
- def is_capturing_frames(self) -> bool:
- """Is the thread capturing frames from the cameras (but not necessarily recording them, that's handled by `self._running_thread.is_recording_frames`)"""
- if not self._running_thread:
- logger.info("Frame Capture thread not running yet")
- return False
- return self._running_thread.is_capturing_frames
-
- @property
- def latest_frame(self) -> FramePayload:
- self._new_frame_ready = False
- return self._running_thread.latest_frame
-
- @property
- def latest_frame_number(self):
- return self._number_of_frames_recorded
-
- @property
- def image_width(self):
- try:
- return int(self._opencv_video_capture_object.get(3))
- except Exception as e:
- raise e
-
- @property
- def image_height(self):
- try:
- return int(self._opencv_video_capture_object.get(4))
- except Exception as e:
- raise e
-
- @property
- def is_open(self):
- return self._opencv_video_capture_object.isOpened()
-
- def connect(self):
- logger.info(f"Connecting to Camera: {self._config.webcam_id}...")
-
- if platform.system() == "Windows":
- logger.info(f"Windows machine detected - using backend `cv2.CAP_DSHOW`")
- cap_backend = cv2.CAP_DSHOW
- else:
- logger.info(f"Non-Windows machine detected - using backend `cv2.CAP_ANY`")
- cap_backend = cv2.CAP_ANY
-
- try:
- self.release()
- except:
- pass
-
- self._opencv_video_capture_object = cv2.VideoCapture(
- int(self._config.webcam_id), cap_backend
- )
-
- try:
- success, image = self._opencv_video_capture_object.read()
- except Exception as e:
- logger.error(
- f"Problem when trying to read frame from Camera: {self._config.webcam_id}"
- )
- traceback.print_exc()
- raise e
-
- if not success or image is None:
- logger.error(
- f"Failed to read frame from camera at port# {self._config.webcam_id}: "
- f"returned value: {success}, "
- f"returned image: {image}"
- )
- raise Exception
-
- self._apply_configuration()
-
- logger.info(f"Successfully connected to Camera: {self._config.webcam_id}!")
- return success
-
- def release(self):
- if self._opencv_video_capture_object is not None:
- logger.debug(
- f"Releasing `opencv_video_capture_object` for Camera: {self._config.webcam_id}"
- )
- self._opencv_video_capture_object.release()
-
- if self._running_thread.is_capturing_frames:
- logger.debug(
- f"Stopping frame capture thread for Camera: {self._config.webcam_id}"
- )
- self._running_thread.stop()
-
- def record_frames(self, save_frames_bool: bool):
- self._running_thread.is_recording_frames = save_frames_bool
-
- def start_frame_capture_thread(self):
- if self.is_capturing_frames:
- logger.debug(
- f"Already capturing frames for webcam_id: {self.webcam_id_as_str}"
- )
- return
- logger.info(f"Beginning frame start thread for webcam: {self.webcam_id_as_str}")
- self._running_thread = self._create_thread()
- self._running_thread.start()
-
- def _create_thread(self):
- logger.debug(f"Creating thread for webcam: {self.webcam_id_as_str}")
- return VideoCaptureThread(
- webcam_id=self.webcam_id_as_str,
- get_next_frame=self.get_next_frame,
- )
-
- def _apply_configuration(self):
- # set camera stream parameters
- logger.info(
- f"Applying configuration to Camera {self._config.webcam_id}:"
- f"Exposure: {self._config.exposure}, "
- f"Resolution width: {self._config.resolution_width}, "
- f"Resolution height: {self._config.resolution_height}, "
- f"Fourcc: {self._config.fourcc}"
- )
- try:
- if not self._opencv_video_capture_object.isOpened():
- logger.error(
- f"Failed to apply configuration to Camera {self._config.webcam_id} - camera is not open"
- )
- return
- except Exception as e:
- logger.error(
- f"Failed when trying to check if Camera {self._config.webcam_id} is open"
- )
- return
-
- try:
- self._opencv_video_capture_object.set(
- cv2.CAP_PROP_EXPOSURE, self._config.exposure
- )
- self._opencv_video_capture_object.set(
- cv2.CAP_PROP_FRAME_WIDTH, self._config.resolution_width
- )
- self._opencv_video_capture_object.set(
- cv2.CAP_PROP_FRAME_HEIGHT, self._config.resolution_height
- )
-
- self._opencv_video_capture_object.set(
- cv2.CAP_PROP_FOURCC, cv2.VideoWriter_fourcc(*self._config.fourcc)
- )
- except Exception as e:
- logger.error(
- f"Problem applying configuration for camera: {self._config.webcam_id}"
- )
- traceback.print_exc()
- raise e
-
- def get_next_frame(self):
-
- try:
- #
- # uncomment above and below these calls to measure the time it takes to grab a frame
- #
- # timestamp_ns_pre = time.perf_counter_ns()
-
- ### Q - Why are we using `cv2.VideoCapture.grab();cv2.VideoCapture.retrieve();` and not just `cv2.VideoCapture.read()`?
- ### A - see -> https://stackoverflow.com/questions/57716962/difference-between-video-capture-read-and-grab
- self._opencv_video_capture_object.grab()
- success, image = self._opencv_video_capture_object.retrieve()
- this_frame_timestamp_perf_counter_ns = (
- time.perf_counter_ns() - self._session_start_time_perf_counter_ns
- )
-
- # timestamp_ns_post = time.perf_counter_ns()
- # it_took_this_many_seconds_to_grab_the_frame = (timestamp_ns_post-timestamp_ns_pre)/1e9
- except:
- logger.error(f"Failed to read frame from Camera: {self.webcam_id_as_str}")
- raise Exception
-
- self._new_frame_ready = success
-
- if success:
- self._number_of_frames_recorded += 1
- # if self._camera_view_update_function is not None:
- # self._camera_view_update_function(self.webcam_id_as_str, cv2.cvtColor(image, cv2.COLOR_BGR2RGB))
-
- return FramePayload(
- success=success,
- image=image,
- timestamp_in_seconds_from_record_start=this_frame_timestamp_perf_counter_ns
- / 1e9,
- timestamp_unix_time_seconds=time.time(),
- frame_number=self.latest_frame_number,
- webcam_id=self.webcam_id_as_str,
- )
-
- def stop_frame_capture(self):
- self.close()
-
- async def show(self):
- viewer = CvCamViewer()
- viewer.begin_viewer(self.webcam_id_as_str)
- while True:
- if self.new_frame_ready:
- viewer.recv_img(self.latest_frame)
- await asyncio.sleep(0)
-
- def close(self):
- try:
- self._running_thread.stop()
- while self._running_thread.is_alive():
- # wait for thread to die.
- # TODO: use threading.Event for synchronize mainthread vs other threads
- time.sleep(0.1)
- except:
- logger.error("Printing traceback")
- traceback.print_exc()
- finally:
- logger.info("Closed {}".format(self._name))
- self._opencv_video_capture_object.release()
diff --git a/src/cameras/detection/cam_detection.py b/src/cameras/detection/cam_detection.py
deleted file mode 100644
index 1e74c062..00000000
--- a/src/cameras/detection/cam_detection.py
+++ /dev/null
@@ -1,72 +0,0 @@
-import logging
-import platform
-import time
-
-import cv2
-import numpy as np
-
-from src.cameras.detection.models import FoundCamerasResponse
-
-CAM_CHECK_NUM = 20 # please give me a reason to increase this number ;D
-
-logger = logging.getLogger(__name__)
-
-
-class DetectPossibleCameras:
- def find_available_cameras(self) -> FoundCamerasResponse:
- cv2_backend = self._determine_backend()
-
- cams_to_use_list = []
- caps_list = []
- for cam_id in range(CAM_CHECK_NUM):
- cap = cv2.VideoCapture(cam_id, cv2_backend)
- success, image = cap.read()
- time0 = time.perf_counter()
- logger.debug(
- f"Trying to read from camera {cam_id} using `cv2_backend`: {cv2_backend}: success={success}, image.__class__ ={image.__class__}"
- )
- if success:
- if image is not None:
- try:
- success, image = cap.read()
- time1 = time.perf_counter()
-
- if time1 - time0 > 0.5:
- logger.debug(
- f"Camera {cam_id} took {time1-time0} seconds to produce a 2nd frame. It might be a virtual camera Skipping it."
- )
- continue # skip to next port number
-
- logger.debug(
- f"Camera found at port number {cam_id}: success={success}, image.shape={image.shape}, cap={cap}"
- )
- cams_to_use_list.append(str(cam_id))
- caps_list.append(cap)
-
- # # # for debugging - uncomment to show cameras as they are detected
- # while True:
- # cv2.imshow(f"Camera {cam_id} - press 'q' to continue", image)
- # if cv2.waitKey(1) & 0xFF == ord('q'):
- # break
- # success, image = cap.read()
-
- except Exception as e:
- logger.error(
- f"Exception raised when looking for a camera at port{cam_id}: {e}"
- )
-
- for cap in caps_list:
- logger.debug(f"Releasing cap {cap}")
- cap.release()
-
- return FoundCamerasResponse(
- number_of_cameras_found=len(cams_to_use_list),
- cameras_found_list=cams_to_use_list,
- cv2_backend=cv2_backend,
- )
-
- def _determine_backend(self):
- if platform.system() == "Windows":
- return cv2.CAP_DSHOW
- else:
- return cv2.CAP_ANY
diff --git a/src/cameras/detection/cam_singleton.py b/src/cameras/detection/cam_singleton.py
deleted file mode 100644
index 4e97a256..00000000
--- a/src/cameras/detection/cam_singleton.py
+++ /dev/null
@@ -1,28 +0,0 @@
-from src.cameras.detection.cam_detection import DetectPossibleCameras
-from src.cameras.detection.models import FoundCamerasResponse
-
-# No consumer should call this "private" variable
-
-_available_cameras: FoundCamerasResponse = None
-
-
-# If you want cams, you call this function
-def get_or_create_cams(always_create=False):
- global _available_cameras
- if _available_cameras is None or always_create:
- d = DetectPossibleCameras()
- _available_cameras = d.find_available_cameras()
-
- return _available_cameras
-
-
-def get_or_create_cams_list(always_create=False):
- """
- same as `get_or_create_cams` but returns a list of camera ids instead of a FoundCamerasResponse object
- """
- found_cameras_response = get_or_create_cams(always_create=always_create)
- available_cameras_list = [
- this_cam.webcam_id for this_cam in found_cameras_response.cameras_found_list
- ]
-
- return available_cameras_list
diff --git a/src/cameras/detection/models.py b/src/cameras/detection/models.py
deleted file mode 100644
index 9fbed837..00000000
--- a/src/cameras/detection/models.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from typing import List
-
-from pydantic import BaseModel
-
-
-class FoundCamerasResponse(BaseModel):
- number_of_cameras_found: int
- cameras_found_list: List[str]
- cv2_backend: int
diff --git a/src/cameras/launch_camera_frame_loop.py b/src/cameras/launch_camera_frame_loop.py
deleted file mode 100644
index 3731bd11..00000000
--- a/src/cameras/launch_camera_frame_loop.py
+++ /dev/null
@@ -1,148 +0,0 @@
-import logging
-from typing import Dict
-
-import traceback
-
-import cv2
-
-from src.cameras.multicam_manager.cv_camera_manager import OpenCVCameraManager
-from src.cameras.webcam_config import WebcamConfig
-
-from src.core_processes.show_cam_window import show_cam_window
-from src.core_processes.utils.image_fps_writer import write_fps_to_image
-from src.core_processes.capture_volume_calibration.charuco_board_detection.charuco_board_detector import (
- CharucoBoardDetector,
-)
-from src.qt_visualizer_and_gui.qt_visualizer_and_gui import QTVisualizerAndGui
-
-logger = logging.getLogger(__name__)
-
-
-def launch_camera_frame_loop(
- session_id: str,
- webcam_configs_dict: Dict[str, WebcamConfig] = None,
- show_camera_views_in_windows: bool = True,
- calibration_videos_bool: bool = False,
- detect_charuco_in_image: bool = True,
- record_frames_bool: bool = True,
- show_visualizer_gui: bool = False,
-):
- any_frames_recorded = False
-
- if detect_charuco_in_image:
- charuco_board_detector = CharucoBoardDetector()
-
- opencv_camera_manager = OpenCVCameraManager(session_id=session_id)
-
- with opencv_camera_manager.start_capture_session_all_cams(
- webcam_configs_dict=webcam_configs_dict,
- calibration_videos=calibration_videos_bool,
- ) as connected_cameras_dict:
-
- timestamp_manager = (
- opencv_camera_manager.timestamp_manager
- ) # <-this is defines the start-time of the timestamp loggers for each camera
-
- try:
-
- if show_visualizer_gui:
- visualizer_gui = QTVisualizerAndGui()
- visualizer_gui.setup_and_launch(
- opencv_camera_manager.available_webcam_ids
- )
-
- should_continue = True
- while should_continue:
-
- if not opencv_camera_manager.new_multi_frame_ready():
- continue
-
- this_multi_frame_payload = opencv_camera_manager.latest_multi_frame
- timestamp_manager.multi_frame_timestamp_logger.log_new_timestamp_seconds_from_unspecified_zero(
- this_multi_frame_payload.multi_frame_timestamp_seconds
- )
-
- for (
- this_webcam_id,
- this_open_cv_camera,
- ) in connected_cameras_dict.items():
-
- this_cam_latest_frame = this_multi_frame_payload.frames_dict[
- this_webcam_id
- ]
-
- if this_cam_latest_frame is None:
- continue
-
- this_cam_timestamp_logger = (
- timestamp_manager.timestamp_logger_for_webcam_id(this_webcam_id)
- )
- this_cam_timestamp_logger.log_new_timestamp_seconds_from_unspecified_zero(
- this_cam_latest_frame.timestamp_in_seconds_from_record_start
- )
-
- # save frame to video file
- if record_frames_bool:
- any_frames_recorded = True
- this_open_cv_camera.video_recorder.append_frame_payload_to_list(
- this_cam_latest_frame
- )
-
- image_to_display = this_cam_latest_frame.image.copy()
-
- if detect_charuco_in_image:
- # detect charuco board
- this_charuco_frame_payload = charuco_board_detector.detect_charuco_board_in_frame_payload(
- this_cam_latest_frame
- )
- image_to_display = (
- this_charuco_frame_payload.annotated_image.copy()
- )
-
- image_to_display = write_fps_to_image(
- image_to_display,
- timestamp_manager.timestamp_logger_for_webcam_id(
- this_webcam_id
- ).median_frames_per_second,
- )
-
- if show_camera_views_in_windows:
- should_continue = show_cam_window(
- this_webcam_id, image_to_display
- )
-
- if show_visualizer_gui:
- visualizer_gui.update_camera_view_image(
- this_webcam_id, image_to_display
- )
-
- # exit loop when user presses ESC key
- exit_key = cv2.waitKey(1)
- if exit_key == 27:
- logger.info("ESC has been pressed.")
- should_continue = False
-
- except:
- logger.error("Printing traceback")
- traceback.print_exc()
- finally:
-
- if show_visualizer_gui:
- visualizer_gui.close()
- if show_camera_views_in_windows:
- # logger.info(f"Destroy window {this_open_cv_camera.webcam_id_as_str}")
- # cv2.destroyWindow(this_open_cv_camera.webcam_id_as_str)
- cv2.destroyAllWindows()
-
- for this_open_cv_camera in connected_cameras_dict.values():
- if any_frames_recorded:
- logger.info(
- f"Saving {this_open_cv_camera.webcam_id_as_str} video to disk"
- )
- this_open_cv_camera.video_recorder.save_list_of_frames_to_video_file(
- this_open_cv_camera.video_recorder.frame_list
- )
- this_open_cv_camera.video_recorder.close()
-
- logger.info("Creating camera timestamp diagnostic plot")
- timestamp_manager.create_diagnostic_plots()
diff --git a/src/cameras/multicam_manager/cv_camera_manager.py b/src/cameras/multicam_manager/cv_camera_manager.py
deleted file mode 100644
index a8d19949..00000000
--- a/src/cameras/multicam_manager/cv_camera_manager.py
+++ /dev/null
@@ -1,231 +0,0 @@
-import logging
-import time
-import traceback
-from contextlib import contextmanager
-from typing import ContextManager, Dict, List, Optional, Union
-
-from pydantic import BaseModel
-
-from src.api.services.user_config import UserConfigService
-from src.cameras.capture.opencv_camera.opencv_camera import OpenCVCamera
-from src.cameras.detection.cam_singleton import get_or_create_cams
-from src.cameras.persistence.video_writer.video_recorder import VideoRecorder
-from src.cameras.webcam_config import WebcamConfig
-from src.core_processes.timestamp_manager.timestamp_manager import (
- TimestampManager,
-)
-from src.pipelines.session_pipeline.data_classes.multi_frame_payload import (
- MultiFramePayload,
-)
-
-logger = logging.getLogger(__name__)
-
-
-class CamAndWriterResponse(BaseModel):
- cv_camera: OpenCVCamera
- video_recorder: Optional[VideoRecorder]
-
- class Config:
- arbitrary_types_allowed = True
-
-
-class OpenCVCameraManager:
- def __init__(
- self,
- session_id: str = None,
- shut_down_event_bool: bool = None,
- ):
- self._session_id = session_id
- self._config_service = UserConfigService()
- self._detected_cams_data = get_or_create_cams()
- self._session_start_time_unix_ns = None
- self._timestamp_manager: Union[TimestampManager, None] = None
- self._connected_cameras_dict = {}
- self._available_cameras_dict = {}
- self._shut_down_event_bool = shut_down_event_bool
- self._number_of_multi_frames = 0
-
- @property
- def timestamp_manager(self):
- if self._timestamp_manager is None:
- logger.error("timestamp manager has not been created yet")
- raise Exception
- else:
- return self._timestamp_manager
-
- @property
- def available_webcam_ids(self):
- return [cam_id.webcam_id for cam_id in get_or_create_cams().cameras_found_list]
-
- @property
- def latest_multi_frame(self) -> Union[MultiFramePayload, None]:
- if not self.new_multi_frame_ready():
- logging.error("a multi_frame was requested before it was ready!")
- raise Exception
-
- this_multi_frame_timestamp_sec = (
- time.perf_counter_ns() - self._session_start_time_perf_counter_ns
- ) / 1e9
-
- this_multi_frame_dict = {}
- each_cam_timestamp = []
-
- for this_cam in self._connected_cameras_dict.values():
- if not this_cam.new_frame_ready:
- logger.error("It shouldnt be able to get here if the `new_multi_frame`")
-
- this_multi_frame_dict[this_cam.webcam_id_as_str] = this_cam.latest_frame
- each_cam_timestamp.append(
- this_cam.latest_frame.timestamp_in_seconds_from_record_start
- )
-
- self._number_of_multi_frames += 1
-
- return MultiFramePayload(
- frames_dict=this_multi_frame_dict,
- multi_frame_number=self._number_of_multi_frames,
- each_frame_timestamp=each_cam_timestamp,
- multi_frame_timestamp_seconds=this_multi_frame_timestamp_sec,
- )
-
- def new_multi_frame_ready(self):
- """cycle through connected cameras and return false if one isn't read yet
- TODO - make another kind of check that uses a clock and sends an empty frame if one camera hasn't yeild a frame within a reasonable time period. With this method, the whol camera system will stall if one camera stops producing frames"""
- for this_cam in self._connected_cameras_dict.values():
- if not this_cam.new_frame_ready:
- return False
- return True
-
- def get_available_cameras(self) -> Dict:
- for this_raw_camera in self._detected_cams_data.cameras_found_list:
- this_webcam_config = WebcamConfig()
- this_webcam_config.webcam_id = this_raw_camera.webcam_id
- self._available_cameras_dict[
- this_webcam_config.webcam_id
- ] = this_webcam_config
-
- return self._available_cameras_dict
-
- @contextmanager
- def start_capture_session_single_cam(
- self, webcam_id: str
- ) -> ContextManager[CamAndWriterResponse]:
- """
- Context manager for easy start up, usage, and cleanup of camera resources.
- Can start frames from a single webcam or all webcams detected.
- """
-
- cv_camera = self._create_single_opencv_cam(webcam_id)
- self._connected_cameras_dict["0"] = cv_camera
- try:
- self._start_frame_capture_on_cam_id(cv_camera)
- self._initialize_timestamp_logger() # start timestamp logger and wha
- yield CamAndWriterResponse(cv_camera=cv_camera)
- self._stop_frame_capture([cv_camera])
- except:
- logger.error("Printing traceback from starting start session by cam")
- traceback.print_exc()
-
- @contextmanager
- def start_capture_session_all_cams(
- self,
- webcam_configs_dict: Dict[str, WebcamConfig] = None,
- camera_view_update_function=None,
- calibration_videos: bool = False,
- ) -> ContextManager[Dict[str, OpenCVCamera]]:
-
- self._initialize_timestamp_logger()
- open_cv_camera_objects = self._create_opencv_cameras(
- session_start_time_perf_counter_ns=self._session_start_time_perf_counter_ns,
- webcam_configs_dict=webcam_configs_dict,
- calibration_videos=calibration_videos,
- )
-
- try:
- for cv_cam in open_cv_camera_objects:
- self._connected_cameras_dict[cv_cam.webcam_id_as_str] = cv_cam
- self._start_frame_capture_on_cam_id(cv_cam)
-
- yield self._connected_cameras_dict
-
- self._stop_frame_capture(open_cv_camera_objects)
- except:
- logger.error("Printing traceback from starting start session by cam")
- traceback.print_exc()
-
- def _create_opencv_cameras(
- self,
- session_start_time_perf_counter_ns: int,
- webcam_configs_dict: Dict[str, WebcamConfig] = None,
- calibration_videos: bool = False,
- ):
-
- raw_camera_objects = self._detected_cams_data.cameras_found_list
- open_cv_cameras: List[OpenCVCamera] = []
-
- for this_raw_cam in raw_camera_objects:
-
- if webcam_configs_dict is None:
- this_webcam_config = WebcamConfig(webcam_id=this_raw_cam.webcam_id)
- else:
- this_webcam_config = webcam_configs_dict[this_raw_cam.webcam_id]
-
- opencv_cam_obj = self._create_single_opencv_cam(
- webcam_id=this_raw_cam.webcam_id,
- webcam_config=this_webcam_config,
- session_start_time_perf_counter_ns=session_start_time_perf_counter_ns,
- calibration_video_bool=calibration_videos,
- )
- open_cv_cameras.append(opencv_cam_obj)
- return open_cv_cameras
-
- def _create_single_opencv_cam(
- self,
- webcam_id: str,
- webcam_config: WebcamConfig(),
- session_start_time_perf_counter_ns: int,
- calibration_video_bool: bool = False,
- ):
- #
- # JSM NOTE - This method seems to want to load webcam_config from disk? It might be useful, but I'll bypass it for now
- #
- # webcam_config_model = self._config_service.webcam_config_by_id(webcam_id, self._session_id)
- # single_camera_config = WebcamConfig(webcam_id=webcam_config_model.webcam_id,
- # exposure=webcam_config_model.exposure,
- # resolution_width=webcam_config_model.resolution_width,
- # resolution_height=webcam_config_model.resolution_height, )
- webcam_config.webcam_id = webcam_id
- return OpenCVCamera(
- config=webcam_config,
- session_id=self._session_id,
- session_start_time_perf_counter_ns=session_start_time_perf_counter_ns,
- calibration_video_bool=calibration_video_bool,
- )
-
- def _initialize_timestamp_logger(self):
-
- self._session_start_time_unix_ns = time.time_ns()
- self._session_start_time_perf_counter_ns = time.perf_counter_ns()
-
- logger.info(
- f"Initializing timestamp loggers - _session_start_time_unix_ns: {self._session_start_time_unix_ns}, _session_start_time_perf_counter_ns: {self._session_start_time_perf_counter_ns} "
- )
-
- self._timestamp_manager = TimestampManager(
- self._session_id,
- self.available_webcam_ids,
- self._session_start_time_unix_ns,
- self._session_start_time_perf_counter_ns,
- )
-
- def _start_frame_capture_on_cam_id(self, opencv_cam: OpenCVCamera):
- opencv_cam.connect()
- opencv_cam.start_frame_capture_thread()
-
- def _stop_frame_capture(self, opencv_cam_objs: List[OpenCVCamera]):
- for cv_cam in opencv_cam_objs:
- cv_cam.stop_frame_capture()
-
- def close(self):
- for this_cam in self._connected_cameras_dict.values():
- this_cam.close()
diff --git a/src/cameras/persistence/video_writer/save_options_dataclass.py b/src/cameras/persistence/video_writer/save_options_dataclass.py
deleted file mode 100644
index d4d1c7b4..00000000
--- a/src/cameras/persistence/video_writer/save_options_dataclass.py
+++ /dev/null
@@ -1,20 +0,0 @@
-from dataclasses import dataclass
-from pathlib import Path
-
-
-@dataclass
-class SaveOptions:
- path_to_save_video: Path
- camera_name: str
- frame_width: int
- frame_height: int
- frames_per_second: float
- fourcc: str = "MP4V"
-
- def __post_init__(self):
- self.video_filename = self.camera_name + "_synchronized_raw.mp4"
- path_to_save_video = None
-
- @property
- def full_path(self):
- return Path().joinpath(self.path_to_save_video, self.video_filename)
diff --git a/src/cameras/persistence/video_writer/video_recorder.py b/src/cameras/persistence/video_writer/video_recorder.py
deleted file mode 100644
index 8ec5f02a..00000000
--- a/src/cameras/persistence/video_writer/video_recorder.py
+++ /dev/null
@@ -1,165 +0,0 @@
-import logging
-import traceback
-from pathlib import Path
-from typing import List, Union
-
-import cv2
-import numpy as np
-import pandas as pd
-
-from src.cameras.capture.dataclasses.frame_payload import FramePayload
-
-logger = logging.getLogger(__name__)
-
-
-class VideoRecorder:
- def __init__(self):
-
- self._frame_payload_list: List[FramePayload] = []
- self._timestamps_npy = np.empty(0)
-
- @property
- def frame_count(self):
- return len(self._frame_payload_list)
-
- @property
- def frame_list(self):
- return self._frame_payload_list
-
- def close(self):
- self._cv2_video_writer.release()
-
- def append_frame_payload_to_list(self, frame_payload: FramePayload):
- self._frame_payload_list.append(frame_payload)
-
- def save_list_of_frames_to_video_file(
- self,
- list_of_frames: List[FramePayload],
- path_to_save_video_file: Union[str, Path],
- frames_per_second: float = None,
- ):
-
- if frames_per_second is None:
- self._timestamps_npy = self._gather_timestamps(list_of_frames)
- try:
- frames_per_second = np.nanmedian((np.diff(self._timestamps_npy) ** -1))
- except Exception as e:
- logger.debug("Error calculating frames per second")
- traceback.print_exc()
- raise e
-
- self._path_to_save_video_file = path_to_save_video_file
-
- self._cv2_video_writer = self._initialize_video_writer(
- image_height=list_of_frames[0].image.shape[0],
- image_width=list_of_frames[0].image.shape[1],
- frames_per_second=frames_per_second,
- )
- self._write_frame_list_to_video_file(list_of_frames)
- self._save_timestamps(timestamps_npy=self._timestamps_npy)
- self._cv2_video_writer.release()
-
- def save_image_list_to_disk(
- self,
- image_list: List[np.ndarray],
- path_to_save_video_file: Union[str, Path],
- frames_per_second: float,
- ):
-
- self._path_to_save_video_file = path_to_save_video_file
-
- if len(image_list) == 0:
- logging.error(f"No frames to save for : {self._path_to_save_video_file}")
- return
-
- self._cv2_video_writer = self._initialize_video_writer(
- image_height=image_list[0].shape[0],
- image_width=image_list[0].shape[1],
- frames_per_second=frames_per_second,
- )
- self._write_image_list_to_video_file(image_list)
-
- def _initialize_video_writer(
- self,
- image_height: Union[int, float],
- image_width: Union[int, float],
- frames_per_second: Union[int, float] = None,
- fourcc: str = "MP4V",
- # calibration_videos: bool = False,
- ) -> cv2.VideoWriter:
-
- video_writer_object = cv2.VideoWriter(
- str(self._path_to_save_video_file),
- cv2.VideoWriter_fourcc(*fourcc),
- frames_per_second,
- (int(image_width), int(image_height)),
- )
-
- if not video_writer_object.isOpened():
- logger.error(
- f"cv2.VideoWriter failed to initialize for: {str(self._path_to_save_video_file)}"
- )
- raise Exception
-
- return video_writer_object
-
- def _write_frame_list_to_video_file(self, list_of_frames: List[FramePayload]):
- try:
- for frame in list_of_frames:
- self._cv2_video_writer.write(frame.image)
-
- except Exception as e:
- logger.error(
- f"Failed during save in video writer for video {str(self._path_to_save_video_file)}"
- )
- traceback.print_exc()
- raise e
- finally:
- logger.info(f"Saved video to path: {self._path_to_save_video_file}")
- self._cv2_video_writer.release()
-
- def _write_image_list_to_video_file(self, image_list: List[np.ndarray]):
- try:
- for image in image_list:
- self._cv2_video_writer.write(image)
- except Exception as e:
- logger.error(
- f"Failed during save in video writer for video {str(self._path_to_save_video_file)}"
- )
- traceback.print_exc()
- raise e
- finally:
- self._cv2_video_writer.release()
-
- def _gather_timestamps(self, list_of_frames: List[FramePayload]) -> np.ndarray:
- timestamps_npy = np.empty(0)
- try:
- for frame in list_of_frames:
- timestamps_npy = np.append(
- timestamps_npy, frame.timestamp_in_seconds_from_record_start
- )
- except:
- logger.error("Error gathering timestamps")
-
- return timestamps_npy
-
- def _save_timestamps(self, timestamps_npy: np.ndarray):
- timestamp_folder_path = self._path_to_save_video_file.parent / "timestamps"
- timestamp_folder_path.mkdir(parents=True, exist_ok=True)
-
- base_timestamp_path_str = str(
- timestamp_folder_path / self._path_to_save_video_file.stem
- )
-
- # save timestamps to npy (binary) file (via numpy.ndarray)
- path_to_save_timestamps_npy = base_timestamp_path_str + "_binary.npy"
- np.save(str(path_to_save_timestamps_npy), timestamps_npy)
- logger.info(f"Saved timestamps to path: {str(path_to_save_timestamps_npy)}")
-
- # save timestamps to human readable (csv/text) file (via pandas.DataFrame)
- path_to_save_timestamps_csv = (
- base_timestamp_path_str + "_timestamps_human_readable.csv"
- )
- timestamp_dataframe = pd.DataFrame(timestamps_npy)
- timestamp_dataframe.to_csv(str(path_to_save_timestamps_csv))
- logger.info(f"Saved timestamps to path: {str(path_to_save_timestamps_csv)}")
diff --git a/src/cameras/save_synchronized_videos.py b/src/cameras/save_synchronized_videos.py
deleted file mode 100644
index ee439479..00000000
--- a/src/cameras/save_synchronized_videos.py
+++ /dev/null
@@ -1,131 +0,0 @@
-from pathlib import Path
-from typing import List, Union, Dict
-
-import numpy as np
-
-from src.cameras.capture.dataclasses.frame_payload import FramePayload
-from src.config.home_dir import DIAGNOSTIC_PLOTS_FOLDER_NAME
-from src.diagnostic_plot_makers.create_timestamp_diagnostic_plots import (
- create_timestamp_diagnostic_plots,
-)
-from src.cameras.persistence.video_writer.video_recorder import VideoRecorder
-
-import logging
-
-logger = logging.getLogger(__name__)
-
-
-def save_synchronized_videos(
- dictionary_of_video_recorders: Dict[str, VideoRecorder],
- folder_to_save_videos=Union[str, Path],
-):
- logger.info(f"saving synchronized video to folder: {str(folder_to_save_videos)}")
-
- each_cam_raw_frame_list = []
- first_frame_timestamps = []
- final_frame_timestamps = []
-
- for video_recoder in dictionary_of_video_recorders.values():
- cam_frame_list = video_recoder.frame_list
- # first_frame_timestamps.append(cam_frame_list[0].timestamp_in_seconds_from_record_start)
- # final_frame_timestamps.append(cam_frame_list[-1].timestamp_in_seconds_from_record_start)
- first_frame_timestamps.append(cam_frame_list[0].timestamp_unix_time_seconds)
- final_frame_timestamps.append(cam_frame_list[-1].timestamp_unix_time_seconds)
- each_cam_raw_frame_list.append(cam_frame_list)
-
- number_of_cameras = len(each_cam_raw_frame_list)
-
- latest_first_frame = np.max(first_frame_timestamps)
- earliest_final_frame = np.min(final_frame_timestamps)
-
- logger.info(f"first_frame_timestamps: {first_frame_timestamps}")
- logger.info(f"np.diff(first_frame_timestamps): {np.diff(first_frame_timestamps)}")
- logger.info(f"latest_first_frame: {latest_first_frame}")
-
- logger.info(f"final_frame_timestamps: {final_frame_timestamps}")
- logger.info(f"np.diff(final_frame_timestamps): {np.diff(final_frame_timestamps)}")
- logger.info(f"earliest_final_frame: {earliest_final_frame}")
-
- each_cam_clipped_frame_list = []
- each_cam_clipped_timestamp_list = []
- for og_frame_list in each_cam_raw_frame_list:
- each_cam_clipped_frame_list.append([])
- each_cam_clipped_timestamp_list.append([])
- for frame in og_frame_list:
- if frame.timestamp_unix_time_seconds < latest_first_frame:
- continue
- if frame.timestamp_unix_time_seconds > earliest_final_frame:
- continue
-
- each_cam_clipped_frame_list[-1].append(frame)
- each_cam_clipped_timestamp_list[-1].append(
- frame.timestamp_unix_time_seconds
- )
-
- number_of_frames_per_camera_clipped = [len(f) for f in each_cam_clipped_frame_list]
- min_number_of_frames = np.min(number_of_frames_per_camera_clipped)
- index_of_the_camera_with_fewest_frames = np.argmin(
- number_of_frames_per_camera_clipped
- )
-
- reference_frame_list = each_cam_clipped_frame_list[
- index_of_the_camera_with_fewest_frames
- ]
- number_of_frames_per_camera = len(reference_frame_list)
-
- each_cam_synchronized_frame_list = []
- for this_cam_number, this_cam_frame_list in enumerate(each_cam_clipped_frame_list):
- this_cam_synchronized_frame_list = []
- for this_reference_frame in reference_frame_list:
- closest_frame = get_nearest_frame(this_cam_frame_list, this_reference_frame)
- this_cam_synchronized_frame_list.append(closest_frame)
- each_cam_synchronized_frame_list.append(this_cam_synchronized_frame_list)
-
- logger.info(
- f" (clipped) number_of_frames_per_camera: {number_of_frames_per_camera_clipped}, min:{min_number_of_frames}"
- )
-
- final_frame_timestamps = [
- frame_list[-1].timestamp_unix_time_seconds
- for frame_list in each_cam_synchronized_frame_list
- ]
-
- logger.info(f"np.diff(final_frame_timestamps): {np.diff(final_frame_timestamps)}")
-
- for camera_id, video_recoder, frame_list in zip(
- dictionary_of_video_recorders.keys(),
- dictionary_of_video_recorders.values(),
- each_cam_synchronized_frame_list,
- ):
- video_recoder.save_list_of_frames_to_video_file(
- list_of_frames=frame_list,
- path_to_save_video_file=Path(folder_to_save_videos)
- / f"Camera_{str(camera_id).zfill(3)}.mp4",
- )
-
- diagnostic_plot_folder = Path(folder_to_save_videos) / DIAGNOSTIC_PLOTS_FOLDER_NAME
- diagnostic_plot_folder.mkdir(parents=True, exist_ok=True)
- path_to_save_plots = diagnostic_plot_folder / "timestamp_diagnostic_plots.png"
- create_timestamp_diagnostic_plots(
- each_cam_raw_frame_list,
- each_cam_synchronized_frame_list,
- path_to_save_plots,
- )
-
-
-def get_nearest_frame(frame_list, reference_frame) -> FramePayload:
- timestamps = gather_timestamps(frame_list)
-
- close_frame_index = np.argmin(
- np.abs(timestamps - reference_frame.timestamp_unix_time_seconds)
- )
-
- return frame_list[close_frame_index]
-
-
-def gather_timestamps(frame_list: List[FramePayload]) -> np.ndarray:
- timestamps_npy = np.empty(0)
- for frame in frame_list:
- timestamps_npy = np.append(timestamps_npy, frame.timestamp_unix_time_seconds)
-
- return timestamps_npy
diff --git a/src/cameras/utils/cap_connection_test.py b/src/cameras/utils/cap_connection_test.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/cameras/viewer/cv_cam_viewer.py b/src/cameras/viewer/cv_cam_viewer.py
deleted file mode 100644
index c6c12647..00000000
--- a/src/cameras/viewer/cv_cam_viewer.py
+++ /dev/null
@@ -1,30 +0,0 @@
-import multiprocessing
-from multiprocessing import Process
-from typing import Union
-
-import cv2
-
-from src.cameras.capture.dataclasses.frame_payload import FramePayload
-
-
-class CvCamViewer:
- def __init__(self):
- self._process: Process = None
- self._payload = None
- self._recv, self._send = multiprocessing.Pipe(duplex=False)
-
- @staticmethod
- def _begin(conn, webcam_id):
- while True:
- payload: FramePayload = conn.recv()
- if payload:
- cv2.imshow(str(webcam_id), payload.image)
- cv2.waitKey(1)
-
- def begin_viewer(self, webcam_id: Union[str, int]):
- self._process = Process(target=CvCamViewer._begin, args=(self._recv, webcam_id))
-
- self._process.start()
-
- def recv_img(self, frame_payload):
- self._send.send(frame_payload)
diff --git a/src/cameras/webcam_config.py b/src/cameras/webcam_config.py
deleted file mode 100644
index 0b707f1d..00000000
--- a/src/cameras/webcam_config.py
+++ /dev/null
@@ -1,16 +0,0 @@
-from typing import List
-
-from pydantic import BaseModel
-
-from src.config.home_dir import os_independent_home_dir
-
-
-class WebcamConfig(BaseModel):
- webcam_id: int = 0
- exposure: int = -7
- resolution_width: int = 1280
- resolution_height: int = 720
- # fourcc: str = "MP4V"
- fourcc: str = "MJPG"
- base_save_video_dir = os_independent_home_dir()
- rotate_video_cv2_code: int = None
diff --git a/src/config/data_paths.py b/src/config/data_paths.py
deleted file mode 100644
index ad1397b9..00000000
--- a/src/config/data_paths.py
+++ /dev/null
@@ -1,16 +0,0 @@
-import os
-from pathlib import Path
-
-BASE_FOLDER_NAME = "freemocap_data"
-
-freemocap_data_path = Path().joinpath(Path.home(), BASE_FOLDER_NAME)
-
-
-def create_home_data_directory():
- path_as_str = str(freemocap_data_path)
- if not os.path.exists(path_as_str):
- os.makedirs(path_as_str)
-
-
-def create_path(*args):
- return Path().joinpath(*args)
diff --git a/src/config/home_dir.py b/src/config/home_dir.py
deleted file mode 100644
index d04039e4..00000000
--- a/src/config/home_dir.py
+++ /dev/null
@@ -1,176 +0,0 @@
-import logging
-import time
-from pathlib import Path
-
-import toml
-
-logger = logging.getLogger(__name__)
-
-# directory names
-BASE_FOLDER_NAME = "freemocap_data"
-LOG_FILE_FOLDER_NAME = "logs"
-SYNCHRONIZED_VIDEOS_FOLDER_NAME = "synchronized_videos"
-CALIBRATION_VIDEOS_FOLDER_NAME = "calibration_videos"
-ANNOTATED_VIDEOS_FOLDER_NAME = "annotated_videos"
-OUTPUT_DATA_FOLDER_NAME = "output_data"
-RAW_DATA_FOLDER_NAME = "raw_data"
-CENTER_OF_MASS_FOLDER_NAME = "center_of_mass"
-PARTIALLY_PROCESSED_DATA_FOLDER_NAME = "partially_processed_data"
-DIAGNOSTIC_PLOTS_FOLDER_NAME = "diagnostic_plots"
-
-# file names
-MOST_RECENT_SESSION_ID_FILENAME = "most_recent_session_id.toml"
-CAMERA_CALIBRATION_FILE_NAME = "camera_calibration_data.toml"
-MEDIAPIPE_2D_NPY_FILE_NAME = (
- "mediapipe_2dData_numCams_numFrames_numTrackedPoints_pixelXY.npy"
-)
-MEDIAPIPE_3D_NPY_FILE_NAME = (
- "mediapipe_3dData_numFrames_numTrackedPoints_spatialXYZ.npy"
-)
-MEDIAPIPE_REPROJECTION_ERROR_NPY_FILE_NAME = (
- "mediapipe_3dData_numFrames_numTrackedPoints_reprojectionError.npy"
-)
-
-SKELETON_BODY_CSV_FILE_NAME = "mediapipe_body_3d_xyz.csv"
-
-SEGMENT_CENTER_OF_MASS_NPY_FILE_NAME = "segmentCOM_frame_joint_xyz.npy"
-
-TOTAL_BODY_CENTER_OF_MASS_NPY_FILE_NAME = "total_body_center_of_mass_xyz.npy"
-
-MEDIAPIPE_3D_ORIGIN_ALIGNED_NPY_FILE_NAME = "mediaPipeSkel_3d_origin_aligned.npy"
-
-
-def create_default_session_id(string_tag: str = None):
- session_id = "session_" + time.strftime("%Y-%m-%d-%H_%M_%S")
-
- if string_tag is not None:
- session_id = session_id + "_" + string_tag
-
- return session_id
-
-
-def get_log_file_path():
- log_folder_path = Path(get_freemocap_data_folder_path()) / LOG_FILE_FOLDER_NAME
- log_folder_path.mkdir(exist_ok=True, parents=True)
- log_file_path = log_folder_path / create_log_file_name()
- return log_file_path
-
-
-def create_log_file_name():
- return "log_" + time.strftime("%m-%d-%Y-%H_%M_%S") + ".log"
-
-
-def save_most_recent_session_id_to_a_toml_in_the_freemocap_data_folder(session_id: str):
- session_id_dict = {}
- session_id_dict["session_id"] = session_id
-
- output_file_path = (
- Path(get_freemocap_data_folder_path()) / MOST_RECENT_SESSION_ID_FILENAME
- )
- with open(str(output_file_path), "w") as toml_file:
- toml.dump(session_id_dict, toml_file)
-
-
-def get_most_recent_session_id() -> str:
- session_id_toml_path = (
- Path(get_freemocap_data_folder_path()) / MOST_RECENT_SESSION_ID_FILENAME
- )
- session_id_dict = toml.load(str(session_id_toml_path))
- return session_id_dict["session_id"]
-
-
-def os_independent_home_dir():
- return str(Path.home())
-
-
-def get_freemocap_data_folder_path(create_folder: bool = True):
- freemocap_data_folder_path = Path(os_independent_home_dir(), BASE_FOLDER_NAME)
-
- if create_folder:
- freemocap_data_folder_path.mkdir(exist_ok=create_folder, parents=True)
-
- return str(freemocap_data_folder_path)
-
-
-def get_session_folder_path(session_id: str, create_folder: bool = False):
- base_save_path = Path(get_freemocap_data_folder_path())
- session_path = base_save_path / session_id
- if create_folder:
- session_path.mkdir(exist_ok=True, parents=True)
- return str(session_path)
-
-
-def create_session_folder(session_id: str):
- session_path = Path(get_session_folder_path(session_id, create_folder=True))
- logger.info(f"Creating session folder at: {str(session_path)}")
-
-
-def get_synchronized_videos_folder_path(session_id: str, create_folder: bool = True):
- synchronized_videos_path = (
- Path(get_session_folder_path(session_id)) / SYNCHRONIZED_VIDEOS_FOLDER_NAME
- )
- if create_folder:
- synchronized_videos_path.mkdir(exist_ok=create_folder, parents=True)
- # this now counts as a "proper" session, so save it to the toml
- save_most_recent_session_id_to_a_toml_in_the_freemocap_data_folder(session_id)
-
- return str(synchronized_videos_path)
-
-
-def get_calibration_videos_folder_path(session_id: str, create_folder: bool = True):
- calibration_videos_path = (
- Path(get_session_folder_path(session_id)) / CALIBRATION_VIDEOS_FOLDER_NAME
- )
- if create_folder:
- calibration_videos_path.mkdir(exist_ok=create_folder, parents=True)
- # this now counts as a "proper" session, so save it to the toml
- save_most_recent_session_id_to_a_toml_in_the_freemocap_data_folder(session_id)
- return str(calibration_videos_path)
-
-
-def get_annotated_videos_folder_path(session_id: str, create_folder: bool = False):
- annotated_videos_path = (
- Path(get_session_folder_path(session_id)) / ANNOTATED_VIDEOS_FOLDER_NAME
- )
- if create_folder:
- annotated_videos_path.mkdir(exist_ok=create_folder, parents=True)
- return str(annotated_videos_path)
-
-
-def get_output_data_folder_path(session_id: str, create_folder: bool = True):
- output_data_folder_path = (
- Path(get_session_folder_path(session_id)) / OUTPUT_DATA_FOLDER_NAME
- )
- if create_folder:
- output_data_folder_path.mkdir(exist_ok=create_folder, parents=True)
- return str(output_data_folder_path)
-
-
-def get_raw_data_folder_path(session_id: str, create_folder: bool = True):
- output_data_folder_path = (
- Path(get_session_folder_path(session_id)) / OUTPUT_DATA_FOLDER_NAME
- )
- raw_data_folder_path = output_data_folder_path / RAW_DATA_FOLDER_NAME
- if create_folder:
- raw_data_folder_path.mkdir(exist_ok=create_folder, parents=True)
- return str(raw_data_folder_path)
-
-
-def get_session_calibration_toml_file_path(session_id: str) -> str:
- calibration_file_path = (
- Path(get_session_folder_path(session_id)) / CAMERA_CALIBRATION_FILE_NAME
- )
- return str(calibration_file_path)
-
-
-def get_skeleton_body_csv_path(session_id: str) -> str:
- skeleton_body_data_path = (
- Path(get_output_data_folder_path(session_id)) / SKELETON_BODY_CSV_FILE_NAME
- )
- return str(skeleton_body_data_path)
-
-
-def get_blender_file_path(session_id: str) -> str:
- blend_file_name = session_id + ".blend"
- blender_file_path = Path(get_output_data_folder_path(session_id)) / blend_file_name
- return str(blender_file_path)
diff --git a/src/core_processes/batch_processing/batch_process_session_folders.py b/src/core_processes/batch_processing/batch_process_session_folders.py
deleted file mode 100644
index 2875247c..00000000
--- a/src/core_processes/batch_processing/batch_process_session_folders.py
+++ /dev/null
@@ -1,107 +0,0 @@
-import logging
-from pathlib import Path
-from typing import Union, Any, Dict
-from rich.pretty import pprint
-
-from src.core_processes.batch_processing.process_session_folder import (
- process_session_folder,
-)
-from src.core_processes.batch_processing.session_processing_parameter_models import (
- SessionProcessingParameterModel,
-)
-from src.core_processes.capture_volume_calibration.anipose_camera_calibration import (
- freemocap_anipose,
-)
-
-logger = logging.getLogger(__name__)
-
-
-def batch_process_session_folders(
- path_to_folder_of_session_folders: Union[str, Path],
- path_to_camera_calibration_toml: Union[str, Path],
- path_to_blender_executable: Union[str, Path],
-):
- """
- Process a folder full of session folders.
-
- Parameters
- ----------
- path_to_folder_of_session_folders : Union[str, Path]
- Path to folder full of session folders.
- path_to_camera_calibration_toml : Union[str, Path]
- Path to camera calibration toml file.
- path_to_blender_executable : Union[str, Path]
- Path to a Blender executable.
-
- """
-
- for session_folder_path in Path(path_to_folder_of_session_folders).iterdir():
- if not session_folder_path.is_dir():
- continue
-
- logger.info(f"Processing session folder: {session_folder_path}")
- if Path(
- session_folder_path / "synchronized_videos"
- ).exists(): # session was recorded freemocap version > v0.0.54 (aka `alpha`)
- synchronized_videos_folder = (
- Path(session_folder_path) / "synchronized_videos"
- )
-
- if Path(
- session_folder_path / "SyncedVideos"
- ).exists(): # session was recorded with freemocap version <= v0.0.54 (aka `pre-alpha`)
- synchronized_videos_folder = Path(session_folder_path) / "SyncedVideos"
- else:
- print(
- f"No folder full of synchronized videos found for {session_folder_path}"
- )
- raise FileNotFoundError
-
- anipose_calibration_object = freemocap_anipose.CameraGroup.load(
- str(path_to_camera_calibration_toml)
- )
-
- output_data_folder = Path(session_folder_path) / "output_data"
- output_data_folder.mkdir(exist_ok=True, parents=True)
-
- session_processing_parameter_model = SessionProcessingParameterModel(
- path_to_session_folder=session_folder_path,
- path_to_output_data_folder=output_data_folder,
- path_to_folder_of_synchronized_videos=synchronized_videos_folder,
- anipose_calibration_object=anipose_calibration_object,
- path_to_blender_executable=path_to_blender_executable,
- )
-
- session_processing_parameter_model.anipose_triangulate_3d_parameters.use_triangulate_ransac_method = (
- False
- )
-
- session_processing_parameter_model.start_processing_at_stage = 0
-
- pprint(session_processing_parameter_model.dict(), expand_all=True)
-
- process_session_folder(session_processing_parameter_model)
-
-
-if __name__ == "__main__":
-
- path_to_folder_of_session_folders = Path(
- r"H:\My Drive\Biol2299_Fall2022\partially_processed\FreeMocap_Data"
- )
- # path_to_folder_of_session_folders = Path(
- # r"H:\My Drive\Biol2299_Fall2022\done_needs_checking"
- # )
-
- path_to_camera_calibration_toml = Path(
- r"H:\My Drive\Biol2299_Fall2022\calibration_recordings\sesh_2022-09-28_15_57_08_calibration\sesh_2022-09-28_15_57_08_calibration_calibration.toml"
- )
-
- path_to_blender_executable = Path(
- r"C:\Program Files\Blender Foundation\Blender 3.2\blender.exe"
- )
-
- batch_process_session_folders(
- path_to_folder_of_session_folders=path_to_folder_of_session_folders,
- path_to_camera_calibration_toml=path_to_camera_calibration_toml,
- path_to_blender_executable=path_to_blender_executable,
- )
diff --git a/src/core_processes/batch_processing/process_session_folder.py b/src/core_processes/batch_processing/process_session_folder.py
deleted file mode 100644
index a12babc4..00000000
--- a/src/core_processes/batch_processing/process_session_folder.py
+++ /dev/null
@@ -1,252 +0,0 @@
-import logging
-from pathlib import Path
-
-import numpy as np
-import pandas as pd
-
-from src.blender_stuff.create_blend_file_from_session_data import (
- create_blend_file_from_session_data,
-)
-from src.config.home_dir import (
- MEDIAPIPE_2D_NPY_FILE_NAME,
- MEDIAPIPE_REPROJECTION_ERROR_NPY_FILE_NAME,
- MEDIAPIPE_3D_NPY_FILE_NAME,
- RAW_DATA_FOLDER_NAME,
-)
-from src.core_processes.capture_volume_calibration.anipose_camera_calibration import (
- freemocap_anipose,
-)
-from src.core_processes.capture_volume_calibration.triangulate_3d_data import (
- triangulate_3d_data,
-)
-from src.core_processes.mediapipe_stuff.convert_mediapipe_npy_to_csv import (
- convert_mediapipe_npy_to_csv,
-)
-from src.core_processes.mediapipe_stuff.mediapipe_skeleton_detector import (
- MediaPipeSkeletonDetector,
-)
-from src.core_processes.post_process_skeleton_data.estimate_skeleton_segment_lengths import (
- estimate_skeleton_segment_lengths,
- mediapipe_skeleton_segment_definitions,
- save_skeleton_segment_lengths_to_json,
-)
-from src.core_processes.post_process_skeleton_data.gap_fill_filter_and_origin_align_skeleton_data import (
- gap_fill_filter_origin_align_3d_data_and_then_calculate_center_of_mass,
-)
-from src.core_processes.batch_processing.session_processing_parameter_models import (
- SessionProcessingParameterModel,
-)
-from src.tests.test_mediapipe_data import (
- test_mediapipe_2d_data,
- test_mediapipe_3d_data,
-)
-
-logger = logging.getLogger(__name__)
-
-
-def process_session_folder(
- session_processing_parameter_model: SessionProcessingParameterModel,
-):
- """
- Process a single session folder.
-
- Parameters
- ----------
- session_processing_parameter_model : SessionProcessingParameterModel
- SessionProcessingParameterModel object (contains all the paths and parameters necessary to process a session folder
-
- """
-
- s = session_processing_parameter_model # make it smol
-
- if s.start_processing_at_stage <= 0:
- if not Path(s.path_to_folder_of_synchronized_videos).exists():
- raise FileNotFoundError(
- f"Could not find synchronized_videos folder at {synchronized_videos_folder}"
- )
-
- logger.info("Detecting 2d skeletons...")
- # 2d skeleton detection
- mediapipe_skeleton_detector = MediaPipeSkeletonDetector(
- parameter_model=s.mediapipe_2d_parameters,
- )
-
- mediapipe_2d_data = mediapipe_skeleton_detector.process_folder_full_of_videos(
- s.path_to_folder_of_synchronized_videos,
- s.path_to_output_data_folder / RAW_DATA_FOLDER_NAME,
- )
-
- assert test_mediapipe_2d_data(
- s.path_to_folder_of_synchronized_videos,
- s.path_to_output_data_folder / RAW_DATA_FOLDER_NAME,
- mediapipe_2d_data,
- )
-
- if s.start_processing_at_stage <= 1:
- logger.info("Triangulating 3d skeletons...")
-
- if s.start_processing_at_stage > 0:
- try:
- mediapipe_2d_data = np.load(
- s.path_to_output_data_folder / MEDIAPIPE_2D_NPY_FILE_NAME
- )
- except FileNotFoundError:
- mediapipe_2d_data = np.load(
- s.path_to_output_data_folder / "mediaPipeData_2d.npy"
- )
- assert test_mediapipe_2d_data(
- s.path_to_folder_of_synchronized_videos,
- s.path_to_output_data_folder,
- mediapipe_2d_data,
- )
-
- (
- raw_skel3d_frame_marker_xyz,
- skeleton_reprojection_error_fr_mar,
- ) = triangulate_3d_data(
- anipose_calibration_object=s.anipose_calibration_object,
- mediapipe_2d_data=mediapipe_2d_data,
- output_data_folder_path=Path(s.path_to_output_data_folder)
- / RAW_DATA_FOLDER_NAME,
- mediapipe_confidence_cutoff_threshold=s.anipose_triangulate_3d_parameters.confidence_threshold_cutoff,
- use_triangulate_ransac=s.anipose_triangulate_3d_parameters.use_triangulate_ransac_method,
- )
-
- assert test_mediapipe_3d_data(
- s.path_to_folder_of_synchronized_videos,
- Path(s.path_to_output_data_folder) / RAW_DATA_FOLDER_NAME,
- raw_skel3d_frame_marker_xyz,
- skeleton_reprojection_error_fr_mar,
- )
-
- if s.start_processing_at_stage <= 2:
- logger.info(
- "Gap-filling, butterworth filtering, origin aligning 3d skeletons, then calculating center of mass ..."
- )
-
- if s.start_processing_at_stage > 1:
- try:
- raw_skel3d_frame_marker_xyz = np.load(
- str(
- Path(s.path_to_output_data_folder)
- / RAW_DATA_FOLDER_NAME
- / MEDIAPIPE_3D_NPY_FILE_NAME
- )
- )
- skeleton_reprojection_error_fr_mar = np.load(
- str(
- Path(s.path_to_output_data_folder)
- / RAW_DATA_FOLDER_NAME
- / MEDIAPIPE_REPROJECTION_ERROR_NPY_FILE_NAME
- )
- )
- except:
- raise FileNotFoundError(
- f"Could not find 3d data at {s.path_to_output_data_folder}"
- )
-
- assert test_mediapipe_3d_data(
- s.path_to_folder_of_synchronized_videos,
- Path(s.path_to_output_data_folder) / RAW_DATA_FOLDER_NAME,
- raw_skel3d_frame_marker_xyz,
- skeleton_reprojection_error_fr_mar,
- )
-
- skel3d_frame_marker_xyz = gap_fill_filter_origin_align_3d_data_and_then_calculate_center_of_mass(
- skel3d_frame_marker_xyz=raw_skel3d_frame_marker_xyz,
- skeleton_reprojection_error_fr_mar=skeleton_reprojection_error_fr_mar,
- path_to_folder_where_we_will_save_this_data=s.path_to_output_data_folder,
- sampling_rate=s.post_processing_parameters.framerate,
- cut_off=s.post_processing_parameters.butterworth_filter_parameters.cutoff_frequency,
- order=s.post_processing_parameters.butterworth_filter_parameters.order,
- reference_frame_number=None,
- )
-
- logger.info(
- "Breaking up big `npy` into smaller bits and converting to `csv`..."
- )
- # break up big NPY and save out csv's
- convert_mediapipe_npy_to_csv(
- mediapipe_3d_frame_trackedPoint_xyz=skel3d_frame_marker_xyz,
- output_data_folder_path=s.path_to_output_data_folder,
- )
-
- if s.start_processing_at_stage <= 3:
- logger.info("Creating Blender animation from motion capture data...")
- # export to Blender
- path_to_skeleton_body_csv = (
- s.path_to_output_data_folder / "mediapipe_body_3d_xyz.csv"
- )
- skeleton_dataframe = pd.read_csv(path_to_skeleton_body_csv)
-
- logger.info("Estimating skeleton segment lengths...")
- skeleton_segment_lengths_dict = estimate_skeleton_segment_lengths(
- skeleton_dataframe=skeleton_dataframe,
- skeleton_segment_definitions=mediapipe_skeleton_segment_definitions,
- )
-
- save_skeleton_segment_lengths_to_json(
- s.path_to_output_data_folder, skeleton_segment_lengths_dict
- )
-
- logger.info("Starting Blender output sub-process...")
- create_blend_file_from_session_data(
- session_folder_path=Path(s.path_to_folder_of_synchronized_videos).parent,
- blender_exe_path=s.path_to_blender_executable,
- )
-
-
-if __name__ == "__main__":
-
- from rich.pretty import pprint
-
- session_folder_path = Path(
- r"H:\My Drive\Biol2299_Fall2022\com_vs_bos_posture_data\sesh_2022-09-28_15_52_24_bbbbbb"
- )
-
- path_to_camera_calibration_toml = Path(
- r"H:\My Drive\Biol2299_Fall2022\calibration_recordings\sesh_2022-09-28_15_39_31_calibration\sesh_2022-09-28_15_39_31_calibration.toml"
- )
-
- path_to_blender_executable = Path(
- r"C:\Program Files\Blender Foundation\Blender 3.2\blender.exe"
- )
-
- anipose_calibration_object = freemocap_anipose.CameraGroup.load(
- str(path_to_camera_calibration_toml)
- )
-
- if Path(
- session_folder_path / "synchronized_videos"
- ).exists(): # freemocap version > v0.0.54 (aka `alpha`)
- synchronized_videos_folder = Path(session_folder_path) / "synchronized_videos"
- elif Path(
- session_folder_path / "SyncedVideos"
- ).exists(): # freemocap version <= v0.0.54 (aka `pre-alpha`)
- synchronized_videos_folder = Path(session_folder_path) / "SyncedVideos"
- else:
- print(f"No folder full of synchronized videos found for {session_folder_path}")
- raise FileNotFoundError
-
- output_data_folder = Path(session_folder_path) / "output_data"
- output_data_folder.mkdir(exist_ok=True, parents=True)
-
- session_processing_parameter_model = SessionProcessingParameterModel(
- path_to_session_folder=session_folder_path,
- path_to_output_data_folder=output_data_folder,
- path_to_folder_of_synchronized_videos=synchronized_videos_folder,
- anipose_calibration_object=anipose_calibration_object,
- path_to_blender_executable=path_to_blender_executable,
- )
-
- session_processing_parameter_model.anipose_triangulate_3d_parameters.use_triangulate_ransac_method = (
- False
- )
-
- session_processing_parameter_model.start_processing_at_stage = 2
-
- pprint(session_processing_parameter_model.dict(), expand_all=True)
-
- process_session_folder(session_processing_parameter_model)
-
- print("Done!")
diff --git a/src/core_processes/batch_processing/session_processing_parameter_models.py b/src/core_processes/batch_processing/session_processing_parameter_models.py
deleted file mode 100644
index ec3cb58f..00000000
--- a/src/core_processes/batch_processing/session_processing_parameter_models.py
+++ /dev/null
@@ -1,46 +0,0 @@
-from pathlib import Path
-from typing import Union
-
-from pydantic import BaseModel
-
-
-class MediaPipe2DParametersModel(BaseModel):
- model_complexity: int = 2
- min_detection_confidence: float = 0.5
- min_tracking_confidence: float = 0.5
- static_image_mode: bool = False
-
-
-class AniposeTriangulate3DParametersModel(BaseModel):
- confidence_threshold_cutoff: float = 0.7
- use_triangulate_ransac_method: bool = True
-
-
-class ButterworthFilterParametersModel(BaseModel):
- sampling_rate: float = 30
- cutoff_frequency: float = 7
- order: int = 4
-
-
-class PostProcessingParametersModel(BaseModel):
- framerate: float = 30.0
- butterworth_filter_parameters = ButterworthFilterParametersModel()
-
-
-class SessionProcessingParameterModel(BaseModel):
- path_to_session_folder: Union[Path, str]
- path_to_output_data_folder: Union[Path, str]
- path_to_folder_of_synchronized_videos: Union[Path, str]
- anipose_calibration_object: object # I don't wtf that thing is lol
- path_to_blender_executable: Union[Path, str]
- mediapipe_2d_parameters: MediaPipe2DParametersModel = MediaPipe2DParametersModel()
- anipose_triangulate_3d_parameters: AniposeTriangulate3DParametersModel = (
- AniposeTriangulate3DParametersModel()
- )
- post_processing_parameters: PostProcessingParametersModel = (
- PostProcessingParametersModel()
- )
- start_processing_at_stage: Union[int, str] = 0
-
- class Config:
- arbitrary_types_allowed = True
diff --git a/src/core_processes/capture_volume_calibration/calibration_dataclasses.py b/src/core_processes/capture_volume_calibration/calibration_dataclasses.py
deleted file mode 100644
index c74da9af..00000000
--- a/src/core_processes/capture_volume_calibration/calibration_dataclasses.py
+++ /dev/null
@@ -1,32 +0,0 @@
-from dataclasses import dataclass
-
-import numpy as np
-
-
-@dataclass
-class CameraCalibrationData:
- image_width: int
- image_height: int
- reprojection_error: float = 1e9
- camera_matrix: np.ndarray = None
- number_of_lens_distortion_coefficients: int = 4
- lens_distortion_coefficients: np.ndarray = None
- rotation_vectors_of_the_board: np.ndarray = None
- translation_vectors_of_the_board: np.ndarray = None
- lens_distortion_std_dev: float = None
- camera_location_std_dev: float = None
-
- def __post_init__(self):
- if self.camera_matrix is None:
- self.camera_matrix = np.array(
- [
- [float(self.image_width), 0.0, self.image_width / 2.0],
- [0.0, float(self.image_width), self.image_height / 2.0],
- [0.0, 0.0, 1.0],
- ]
- )
-
- if self.lens_distortion_coefficients is None:
- self.lens_distortion_coefficients = np.zeros(
- (self.number_of_lens_distortion_coefficients, 1)
- )
diff --git a/src/core_processes/capture_volume_calibration/calibration_diagnostics_visualizer.py b/src/core_processes/capture_volume_calibration/calibration_diagnostics_visualizer.py
deleted file mode 100644
index 0532cafb..00000000
--- a/src/core_processes/capture_volume_calibration/calibration_diagnostics_visualizer.py
+++ /dev/null
@@ -1,199 +0,0 @@
-import numpy as np
-import pyqtgraph as pg
-import pyqtgraph.opengl as gl
-from pyqtgraph.dockarea.Dock import Dock
-from pyqtgraph.dockarea.DockArea import DockArea
-from pyqtgraph.Qt import QtWidgets
-
-import cv2
-
-from src.core_processes.capture_volume_calibration.calibration_dataclasses import (
- CameraCalibrationData,
-)
-
-
-class CalibrationDiagnosticsVisualizer:
- def __init__(self):
- # dummy data to initialize subplots
- self.reprojection_error_all = np.empty(0)
- self.reprojection_error_current_best = np.empty(0)
- self.image_point_original = np.empty(0)
- self.image_point_remapped = np.empty(0)
-
- # create icis_conference_main app and window
- self.pyqtgraph_app = pg.mkQApp("DockArea Example")
- self.main_window_widget = QtWidgets.QMainWindow()
- self.dock_area = DockArea()
- self.main_window_widget.setCentralWidget(self.dock_area)
- self.main_window_widget.resize(1000, 500)
- self.main_window_widget.setWindowTitle(
- "Lens Distortion Calibration Diagnostics (pyqtgraph)"
- )
-
- # create widget/dock for image subplot (based on `GraphicsItems - ImageItem - video` example `python -m pyqtgraph.examples`)
- self.image_view_widget = pg.ImageView()
-
- self.undistorted_image_dock = Dock("Undistorted Image")
- self.undistorted_image_dock.addWidget(self.image_view_widget)
- self.dock_area.addDock(self.undistorted_image_dock)
-
- # create widget/dock for reprojection error subplot
- self.reprojection_error_plot_widget = pg.PlotWidget(title="Reprojection Error")
- self.reprojection_error_plot_widget.setLabel(
- "left", "Reprojection Error", units="pixels"
- )
- self.reprojection_error_plot_widget.setLabel("bottom", "Time", units="Frame#")
- self.reprojection_error_plot_widget.setYRange(0, 2)
- self.reprojection_error_plot_widget.addLegend()
- self.reprojection_error_all_line = self.reprojection_error_plot_widget.plot(
- self.reprojection_error_all,
- pen=(255, 0, 128),
- name="reprojection error- all",
- )
- self.reprojection_error_current_best_line = (
- self.reprojection_error_plot_widget.plot(
- self.reprojection_error_current_best, name="current best"
- )
- )
-
- self.reprojection_error_dock = Dock("Reprojection Error")
- self.reprojection_error_dock.addWidget(self.reprojection_error_plot_widget)
- self.dock_area.addDock(self.reprojection_error_dock, position="right")
-
- # create widget/dock lens distortion remapping subplot
- self.image_point_remapping_plot_widget = pg.PlotWidget(
- title="Image Point Remapping"
- )
- self.image_point_remapping_plot_widget.setLabel(
- "left", "Y-position", units="pixels"
- )
- self.image_point_remapping_plot_widget.setLabel(
- "bottom", "X-position", units="pixels"
- )
- self.image_point_remapping_plot_widget.addLegend()
-
- self.image_point_original_dottos = self.image_point_remapping_plot_widget.plot(
- self.image_point_original,
- self.image_point_original,
- pen=None,
- symbol="o",
- symbolBrush=None,
- symbolPen=(150, 150, 150),
- name="image points - original",
- )
- self.image_point_remapped_dottos = self.image_point_remapping_plot_widget.plot(
- self.image_point_remapped,
- self.image_point_remapped,
- symbol="+",
- pen=None,
- symbolBrush=None,
- symbolPen=(50, 150, 210),
- name="image points - remapped",
- )
- self.image_point_remapping_plot_dock = Dock("Image Point Remapping")
- self.image_point_remapping_plot_dock.addWidget(
- self.image_point_remapping_plot_widget
- )
- self.dock_area.addDock(self.image_point_remapping_plot_dock)
-
- ###########
- # create widget/dock opengl 3d plot for charuco dottos
- self.opengl_3d_plot_widget = gl.GLViewWidget()
- self.opengl_grid_item = gl.GLGridItem()
- self.opengl_3d_plot_widget.addItem(self.opengl_grid_item)
-
- # create XYZ axes
- x_axis_line_array = np.array([[0, 0, 0], [1, 0, 0]])
- y_axis_line_array = np.array([[0, 0, 0], [0, 1, 0]])
- z_axis_line_array = np.array([[0, 0, 0], [0, 0, 1]])
-
- self.origin_x_axis_gl_lineplot_item = gl.GLLinePlotItem(
- pos=x_axis_line_array, color=(1, 0, 0, 1), width=1.0, antialias=True
- )
- self.origin_y_axis_gl_lineplot_item = gl.GLLinePlotItem(
- pos=y_axis_line_array, color=(0, 1, 0, 1), width=1.0, antialias=True
- )
- self.origin_z_axis_gl_lineplot_item = gl.GLLinePlotItem(
- pos=z_axis_line_array, color=(0, 0, 1, 1), width=1.0, antialias=True
- )
- self.opengl_3d_plot_widget.addItem(self.origin_x_axis_gl_lineplot_item)
- self.opengl_3d_plot_widget.addItem(self.origin_y_axis_gl_lineplot_item)
- self.opengl_3d_plot_widget.addItem(self.origin_z_axis_gl_lineplot_item)
-
- self.opengl_charuco_scatter_item = gl.GLScatterPlotItem(
- pos=(0, 0, 0), color=(1, 0, 1), size=1, pxMode=False
- )
-
- self.opengl_3d_plot_dock = Dock("Image Point Remapping")
- self.opengl_3d_plot_dock.addWidget(self.opengl_3d_plot_widget)
- self.dock_area.addDock(
- self.opengl_3d_plot_dock, "right", self.image_point_remapping_plot_dock
- )
-
- ###
- # create widget/dock for calibration text window
- self.calibration_text_widget = QtWidgets.QLabel()
-
- self.calibration_text_dock = Dock("Calibration Data")
- self.calibration_text_dock.addWidget(self.calibration_text_widget)
- self.dock_area.addDock(
- self.calibration_text_dock, "above", self.image_point_remapping_plot_dock
- )
-
- self._display_main_window()
-
- def _display_main_window(self):
- # display window
- self.main_window_widget.show_window()
-
- def update_image_subplot(self, new_image):
- self.image_view_widget.setImage(
- cv2.cvtColor(
- cv2.rotate(new_image, cv2.ROTATE_90_COUNTERCLOCKWISE), cv2.COLOR_BGR2RGB
- )
- )
-
- def update_reprojection_error_subplot(
- self, reprojection_error_new, reprojection_error_current_best
- ):
- self.reprojection_error_all = np.append(
- self.reprojection_error_all, reprojection_error_new
- )
- self.reprojection_error_current_best = np.append(
- self.reprojection_error_current_best, reprojection_error_current_best
- )
-
- self.reprojection_error_all_line.setData(self.reprojection_error_all)
- self.reprojection_error_current_best_line.setData(
- self.reprojection_error_current_best
- )
-
- def update_calibration_text_overlay(self, calibration_data: CameraCalibrationData):
- lens_distortion_as_str = [
- f"{d[0]:.3f}" for d in calibration_data.lens_distortion_coefficients
- ]
- calibration_text = f"reprojection error:{calibration_data.reprojection_error:.3f} \n {lens_distortion_as_str} \n {str(calibration_data.camera_matrix)}"
- self.calibration_text_widget.setText(calibration_text)
-
- def update_image_point_remapping_subplot(
- self,
- image_point_original_x,
- image_point_original_y,
- image_point_remapped_x,
- image_point_remapped_y,
- ):
- self.image_point_original_dottos.setData(
- x=image_point_original_x, y=image_point_original_y
- )
-
- self.image_point_remapped_dottos.setData(
- x=image_point_remapped_x, y=image_point_remapped_y
- )
-
- def update_3d_subplot(self, charuco_xyz: np.ndarray = None):
- if charuco_xyz is None:
- return
- self.opengl_charuco_scatter_item.setData(pos=charuco_xyz)
-
- def close(self):
- self.main_window_widget.close()
diff --git a/src/core_processes/capture_volume_calibration/camera_calibrator.py b/src/core_processes/capture_volume_calibration/camera_calibrator.py
deleted file mode 100644
index 57f12052..00000000
--- a/src/core_processes/capture_volume_calibration/camera_calibrator.py
+++ /dev/null
@@ -1,142 +0,0 @@
-import logging
-
-import cv2
-
-from src.cameras.capture.dataclasses.frame_payload import FramePayload
-from src.cameras.capture.opencv_camera.opencv_camera import OpenCVCamera
-from src.core_processes.capture_volume_calibration.calibration_dataclasses import (
- CameraCalibrationData,
-)
-from src.core_processes.capture_volume_calibration.charuco_board_detection.charuco_board_detector import (
- CharucoBoardDetector,
-)
-from src.core_processes.capture_volume_calibration.charuco_board_detection.charuco_image_annotator import (
- annotate_image_with_charuco_data,
-)
-from src.core_processes.capture_volume_calibration.charuco_board_detection import (
- CharucoViewData,
-)
-
-logger = logging.getLogger(__name__)
-
-
-class CameraCalibrator:
- def __init__(
- self,
- charuco_board_detector: CharucoBoardDetector = CharucoBoardDetector(),
- ):
- self._current_calibration = None
- self._charuco_board_detector = charuco_board_detector
-
- @property
- def charuco_board_detector(self):
- return self._charuco_board_detector
-
- def calibrate(self, this_camera: OpenCVCamera):
- annotated_image = self._process_incoming_frame(this_camera.latest_frame)
-
- return annotated_image
-
- def _process_incoming_frame(self, raw_frame_payload: FramePayload):
-
- charuco_frame_payload = (
- self._charuco_board_detector.detect_charuco_board_in_frame_payload(
- raw_frame_payload
- )
- )
-
- charuco_view_data = charuco_frame_payload.charuco_view_data
-
- if self._current_calibration is None:
- self._current_calibration = CameraCalibrationData(
- charuco_view_data.image_width, charuco_view_data.image_height
- )
-
- if not charuco_view_data.full_board_found and self._current_calibration is None:
- return charuco_frame_payload.annotated_image, self._current_calibration
-
- if charuco_view_data.full_board_found:
- self._calibrate_camera(charuco_view_data) # this is where the magic happens
-
- if charuco_view_data.some_charuco_corners_found:
- annotate_image_with_charuco_data(
- raw_frame_payload.image, # this image will have stuff drawn on top of it inside this function
- charuco_view_data,
- self._charuco_board_detector.number_of_charuco_corners,
- )
-
- undistorted_image = cv2.undistort(
- raw_frame_payload.image,
- self._current_calibration.camera_matrix,
- self._current_calibration.lens_distortion_coefficients,
- )
-
- return undistorted_image, self._current_calibration
-
- def _calibrate_camera(self, charuco_view: CharucoViewData):
- """
- adapted from - https://mecaruco2.readthedocs.io/en/latest/notebooks_rst/Aruco/sandbox/ludovic/aruco_calibration_rotation.html
-
- Calibrates the camera using the charuco data
-
- helpful resources -
- https://docs.opencv.org/4.x/d9/d0c/group__calib3d.html <-opencv's 3d camera calibration docs
- https://www.adamsmith.haus/python/docs/cv2.aruco.calibrateCameraCharucoExtended
- https://www.mathworks.com/help/vision/ug/camera-calibration.html
- https://docs.opencv.org/3.4/d9/db7/tutorial_py_table_of_contents_calib3d.html
- https://calib.io/blogs/knowledge-base/camera-models <-a good one
- """
- print("CAMERA CALIBRATION")
-
- image_width = charuco_view.image_width
- image_height = charuco_view.image_height
-
- # flag definitions -> https://docs.opencv.org/4.x/d9/d0c/group__calib3d.html#ga3207604e4b1a1758aa66acb6ed5aa65d
- flags = (
- cv2.CALIB_USE_INTRINSIC_GUESS
- + cv2.CALIB_ZERO_TANGENT_DIST
- + cv2.cv2.CALIB_FIX_ASPECT_RATIO
- + cv2.CALIB_FIX_PRINCIPAL_POINT
- +
- # cv2.CALIB_FIX_FOCAL_LENGTH
- cv2.CALIB_RATIONAL_MODEL
- # cv2.CALIB_THIN_PRISM_MODEL
- # cv2.CALIB_TILTED_MODEL
- )
-
- # https://docs.opencv.org/4.x/d9/d6a/group__aruco.html#gacf03e5afb0bc516b73028cf209984a06
- (
- this_reprojection_error,
- this_camera_matrix,
- these_lens_distortion_coefficients,
- these_rotation_vectors_of_the_board,
- these_translation_vectors_of_the_board,
- this_lens_distortion_std_dev,
- this_camera_location_std_dev,
- these_reprojection_error_per_view,
- ) = cv2.aruco.calibrateCameraCharucoExtended(
- charucoCorners=[charuco_view.charuco_corners],
- charucoIds=[charuco_view.charuco_ids],
- board=self._charuco_board_detector.cv2_aruco_charuco_board,
- imageSize=(image_width, image_height),
- cameraMatrix=self._current_calibration.camera_matrix,
- distCoeffs=self._current_calibration.lens_distortion_coefficients,
- flags=flags,
- criteria=(cv2.TERM_CRITERIA_EPS & cv2.TERM_CRITERIA_COUNT, 10000, 1e-9),
- )
-
- if this_reprojection_error < self._current_calibration.reprojection_error:
- self._current_calibration = CameraCalibrationData(
- reprojection_error=this_reprojection_error,
- camera_matrix=this_camera_matrix,
- lens_distortion_coefficients=these_lens_distortion_coefficients,
- image_width=image_width,
- image_height=image_height,
- rotation_vectors_of_the_board=these_rotation_vectors_of_the_board,
- translation_vectors_of_the_board=these_translation_vectors_of_the_board,
- lens_distortion_std_dev=this_lens_distortion_std_dev,
- camera_location_std_dev=this_camera_location_std_dev,
- )
-
- def reconstruct_3d_charuco(self, charuco_data_per_camera_dictionary):
- pass
diff --git a/src/core_processes/capture_volume_calibration/charuco_board_detection/charuco_board_detector.py b/src/core_processes/capture_volume_calibration/charuco_board_detection/charuco_board_detector.py
deleted file mode 100644
index 82cf09f5..00000000
--- a/src/core_processes/capture_volume_calibration/charuco_board_detection/charuco_board_detector.py
+++ /dev/null
@@ -1,176 +0,0 @@
-import logging
-from typing import Dict, List
-
-import cv2
-import numpy as np
-
-from src.cameras.capture.dataclasses.frame_payload import FramePayload
-from src.core_processes.capture_volume_calibration.charuco_board_detection.dataclasses.charuco_board_definition import (
- CharucoBoardDefinition,
-)
-from src.core_processes.capture_volume_calibration.charuco_board_detection.dataclasses.charuco_frame_payload import (
- CharucoFramePayload,
-)
-from src.core_processes.capture_volume_calibration.charuco_board_detection.dataclasses.charuco_view_data import (
- CharucoViewData,
-)
-
-from src.core_processes.capture_volume_calibration.charuco_board_detection.charuco_image_annotator import (
- annotate_image_with_charuco_data,
-)
-
-logger = logging.getLogger(__name__)
-
-
-class CharucoBoardDetector:
- def __init__(self):
- self.charuco_board_data_class_object = CharucoBoardDefinition()
- self.cv2_aruco_charuco_board = (
- self.charuco_board_data_class_object.charuco_board
- )
- self.aruco_marker_dict = self.charuco_board_data_class_object.aruco_marker_dict
- self.number_of_charuco_corners = (
- self.charuco_board_data_class_object.number_of_charuco_corners
- )
-
- def detect_charuco_board_in_frame_payload(
- self, raw_frame_payload: FramePayload
- ) -> CharucoFramePayload:
-
- if raw_frame_payload.image is None:
- logger.error("Frame is empty")
- return CharucoFramePayload()
-
- charuco_view_data = self.detect_charuco_board_in_an_image(
- raw_frame_payload.image
- )
-
- annotated_image = raw_frame_payload.image.copy()
- if charuco_view_data.some_charuco_corners_found:
- annotate_image_with_charuco_data(
- annotated_image, # this image will have stuff drawn on top of it inside this function
- charuco_view_data,
- self.number_of_charuco_corners,
- )
-
- return CharucoFramePayload(
- annotated_image=annotated_image,
- raw_frame_payload=raw_frame_payload,
- charuco_view_data=charuco_view_data,
- )
-
- def detect_charuco_board_in_an_image(self, raw_image) -> CharucoViewData:
- """
- detect charuco board in an image.
- more-or-less copied from - https://mecaruco2.readthedocs.io/en/latest/notebooks_rst/Aruco/sandbox/ludovic/aruco_calibration_rotation.html
-
- """
- if raw_image is None:
- logger.error("Image is empty!")
- return CharucoViewData()
-
- image_height, image_width, num_color_channels = raw_image.shape
- charuco_corners = []
- charuco_ids = []
-
- # SUB PIXEL CORNER DETECTION CRITERION
- termination_criteria_threshold = (
- cv2.TERM_CRITERIA_EPS + cv2.TERM_CRITERIA_MAX_ITER,
- 100,
- 0.0001,
- )
-
- grayscale_image = cv2.cvtColor(raw_image, cv2.COLOR_BGR2GRAY)
-
- (
- aruco_square_corners,
- aruco_square_ids,
- rejected_image_points,
- ) = cv2.aruco.detectMarkers(grayscale_image, self.aruco_marker_dict)
-
- full_board_found = False
- any_markers_found = False
- some_charuco_corners_found = False
-
- if len(aruco_square_corners) > 0:
- any_markers_found = True
- # refine detected corner locations to provide sub-pixel precision
- # https://docs.opencv.org/4.x/dd/d1a/group__imgproc__feature.html#ga354e0d7c86d0d9da75de9b9701a9a87e
- for this_corner in aruco_square_corners:
- cv2.cornerSubPix(
- grayscale_image,
- this_corner,
- winSize=(3, 3),
- zeroZone=(-1, -1),
- criteria=termination_criteria_threshold,
- )
- results = cv2.aruco.interpolateCornersCharuco(
- aruco_square_corners,
- aruco_square_ids,
- grayscale_image,
- self.cv2_aruco_charuco_board,
- )
-
- if (
- results[1] is not None
- and results[2] is not None
- and len(results[1]) > 3
- ):
- some_charuco_corners_found = True
-
- charuco_corners = results[1]
- charuco_ids = results[2]
-
- if len(charuco_ids) == self.number_of_charuco_corners:
- full_board_found = True
-
- return CharucoViewData(
- charuco_board_object=self.charuco_board_data_class_object,
- full_board_found=full_board_found,
- some_charuco_corners_found=some_charuco_corners_found,
- any_markers_found=any_markers_found,
- charuco_corners=charuco_corners,
- charuco_ids=charuco_ids,
- aruco_square_corners=aruco_square_corners,
- aruco_square_ids=aruco_square_ids,
- image_width=image_width,
- image_height=image_height,
- )
-
- def format_charuco2d_data(self, this_multi_frame_charuco_data_list: List) -> Dict:
-
- number_of_tracked_points = this_multi_frame_charuco_data_list[
- 0
- ].charuco_view_data.charuco_board_object.number_of_charuco_corners
-
- charuco2d_data_per_cam_dict = {}
- base_charuco_data_npy_with_nans_for_missing_data_xy = np.zeros(
- (number_of_tracked_points, 2)
- )
- base_charuco_data_npy_with_nans_for_missing_data_xy[:] = np.nan
- for this_cam_data in this_multi_frame_charuco_data_list:
- if this_cam_data.charuco_view_data.some_charuco_corners_found:
- this_frame_charuco_data_xy = (
- base_charuco_data_npy_with_nans_for_missing_data_xy.copy()
- )
- charuco_ids_in_this_frame_idx = (
- this_cam_data.charuco_view_data.charuco_ids
- )
- charuco_corners_in_this_frame_xy = (
- this_cam_data.charuco_view_data.charuco_corners
- )
- this_frame_charuco_data_xy[
- charuco_ids_in_this_frame_idx, :
- ] = charuco_corners_in_this_frame_xy
-
- this_webcam_id = this_cam_data.raw_frame_payload.webcam_id
- charuco2d_data_per_cam_dict[this_webcam_id] = this_frame_charuco_data_xy
-
- return charuco2d_data_per_cam_dict
-
-
-if __name__ == "__main__":
- pass
- # ## Jon, Run me to easily start a charuco board detect calculate_center_of_mass
- # print('starting icis_conference_main')
- # BoardDetection().process()
diff --git a/src/core_processes/capture_volume_calibration/charuco_board_detection/charuco_image_annotator.py b/src/core_processes/capture_volume_calibration/charuco_board_detection/charuco_image_annotator.py
deleted file mode 100644
index 40474cde..00000000
--- a/src/core_processes/capture_volume_calibration/charuco_board_detection/charuco_image_annotator.py
+++ /dev/null
@@ -1,80 +0,0 @@
-from typing import List
-
-import cv2
-import numpy as np
-
-from src.core_processes.capture_volume_calibration.charuco_board_detection.dataclasses.charuco_view_data import (
- CharucoViewData,
-)
-
-
-def _board_text(
- charuco_ids: List[int],
- num_charuco_corners: int,
- full_board_detected_bool: bool,
-):
- num_ids_as_str = str(len(charuco_ids))
- num_corners_as_str = str(num_charuco_corners)
- text = (
- f"{num_ids_as_str} of {num_corners_as_str} Charuco Corner Points Detected "
- f"| Full Board Detected: {full_board_detected_bool}"
- )
- return text
-
-
-def annotate_image_with_charuco_data(
- image, charuco_view_data: CharucoViewData, number_of_charuco_corners: int
-) -> bool:
-
- annotated_image = cv2.aruco.drawDetectedCornersCharuco(
- image,
- np.array(charuco_view_data.charuco_corners),
- np.array(charuco_view_data.charuco_ids),
- (0, 255, 125, 255),
- ) # yellow? I
- # think cv2 uses BGR instead of RGB?
-
- current_cam_corner_count_str = _board_text(
- charuco_view_data.charuco_ids,
- number_of_charuco_corners,
- charuco_view_data.full_board_found,
- )
- # TODO - Determine 'shared views' (i.e. frames in which a full board is detected by 2
- # cameras)
- # TODO - self.determine_shared_charuco_board_views()
- # this_cam_shared_views_str = " | Shared Views: " + str(
- # each_cameras_shared_board_view_count_total)
- text_to_write_on_this_camera = current_cam_corner_count_str
-
- position = (10, 50)
- cv2.putText(
- annotated_image, # numpy array on which text is written
- text_to_write_on_this_camera, # text
- position, # position at which writing has to start
- cv2.FONT_HERSHEY_SIMPLEX, # font family
- 0.5, # font size
- (30, 10, 0, 255), # font color
- 2,
- ) # font stroke (draw a darker heavier font beneath a lighter/thinner copy for
- # readability)
-
- cv2.putText(
- annotated_image, # numpy array on which text is written
- text_to_write_on_this_camera, # text
- position, # position at which writing has to start
- cv2.FONT_HERSHEY_SIMPLEX,
- # font family (very limited selection, i think there's some interesting CV history
- # here...)
- 0.5, # font size
- (209, 180, 0, 255), # font color
- 1,
- ) # font stroke
-
- if charuco_view_data.full_board_found:
- cv2.polylines(
- annotated_image,
- np.int32([charuco_view_data.charuco_corners]),
- False,
- (0, 100, 255),
- 2,
- )
diff --git a/src/core_processes/capture_volume_calibration/charuco_board_detection/dataclasses/charuco_board_definition.py b/src/core_processes/capture_volume_calibration/charuco_board_detection/dataclasses/charuco_board_definition.py
deleted file mode 100644
index 75aca0eb..00000000
--- a/src/core_processes/capture_volume_calibration/charuco_board_detection/dataclasses/charuco_board_definition.py
+++ /dev/null
@@ -1,29 +0,0 @@
-from dataclasses import dataclass
-from typing import Dict
-
-import cv2
-import numpy as np
-
-
-@dataclass
-class CharucoBoardDefinition:
- aruco_marker_dict: Dict = cv2.aruco.Dictionary_get(cv2.aruco.DICT_4X4_250)
- # number_of_squares_width: int = 5
- # number_of_squares_height: int = 3
- number_of_squares_width: int = 7
- number_of_squares_height: int = 5
- black_square_side_length: int = 1
- aruco_marker_length_proportional: float = 0.8
-
- def __post_init__(self):
- self.charuco_board = cv2.aruco.CharucoBoard_create(
- self.number_of_squares_width,
- self.number_of_squares_height,
- self.black_square_side_length,
- self.aruco_marker_length_proportional,
- self.aruco_marker_dict,
- )
-
- self.number_of_charuco_corners = (self.number_of_squares_width - 1) * (
- self.number_of_squares_height - 1
- )
diff --git a/src/core_processes/capture_volume_calibration/charuco_board_detection/dataclasses/charuco_frame_payload.py b/src/core_processes/capture_volume_calibration/charuco_board_detection/dataclasses/charuco_frame_payload.py
deleted file mode 100644
index 50a7252c..00000000
--- a/src/core_processes/capture_volume_calibration/charuco_board_detection/dataclasses/charuco_frame_payload.py
+++ /dev/null
@@ -1,15 +0,0 @@
-from dataclasses import dataclass
-
-import numpy as np
-
-from src.cameras.capture.dataclasses.frame_payload import FramePayload
-from src.core_processes.capture_volume_calibration.charuco_board_detection.dataclasses.charuco_view_data import (
- CharucoViewData,
-)
-
-
-@dataclass
-class CharucoFramePayload:
- raw_frame_payload: FramePayload = FramePayload()
- annotated_image: np.ndarray = None
- charuco_view_data: CharucoViewData = CharucoViewData()
diff --git a/src/core_processes/capture_volume_calibration/charuco_board_detection/dataclasses/charuco_view_data.py b/src/core_processes/capture_volume_calibration/charuco_board_detection/dataclasses/charuco_view_data.py
deleted file mode 100644
index d904d51a..00000000
--- a/src/core_processes/capture_volume_calibration/charuco_board_detection/dataclasses/charuco_view_data.py
+++ /dev/null
@@ -1,34 +0,0 @@
-import logging
-from dataclasses import dataclass
-
-import numpy as np
-
-from src.core_processes.capture_volume_calibration.charuco_board_detection.dataclasses.charuco_board_definition import (
- CharucoBoardDefinition,
-)
-
-logger = logging.getLogger(__name__)
-
-
-@dataclass
-class CharucoViewData:
- charuco_board_object: CharucoBoardDefinition = (
- None # the charuco board definition this 'view' was trying to detect
- )
- charuco_corners: np.ndarray = None
- charuco_ids: np.ndarray = None
- aruco_square_corners: np.ndarray = None
- aruco_square_ids: np.ndarray = None
- full_board_found: bool = False
- some_charuco_corners_found: bool = False
- any_markers_found: bool = False
- image_width: int = None
- image_height: int = None
-
- def __post_init__(self):
- if self.some_charuco_corners_found:
- if self.some_charuco_corners_found:
- if self.charuco_board_object is None:
- logger.warning(
- "If there is any data in this view point, you should also include a copy of the charcuo_board that was being detected"
- )
diff --git a/src/core_processes/capture_volume_calibration/charuco_board_detection/shared_board_view_detection.py b/src/core_processes/capture_volume_calibration/charuco_board_detection/shared_board_view_detection.py
deleted file mode 100644
index 0d323672..00000000
--- a/src/core_processes/capture_volume_calibration/charuco_board_detection/shared_board_view_detection.py
+++ /dev/null
@@ -1,22 +0,0 @@
-def determine_shared_charuco_board_views(self):
- pass
- # # determine paired board views
- # for this_cam_num in range(multi_cam.num_cams):
- # if full_charuco_detected_on_this_frame[this_cam_num]:
- # for this_other_camera_num in range(multi_cam.num_cams):
- # if this_other_camera_num != this_cam_num:
- # if full_charuco_detected_on_this_frame[this_other_camera_num]:
- # each_cameras_shared_board_view_count_array[this_cam_num,
- # this_other_camera_num] += 1
- # each_cameras_shared_board_view_count_total = np.sum(
- # each_cameras_shared_board_view_count_array, axis=1)
- # # print(each_cameras_shared_board_view_count)
- #
- # for this_pair_num, this_cam_pair in enumerate(camera_pair_list):
- # camera_one_id = this_cam_pair[0]
- # camera_two_id = this_cam_pair[1]
- #
- # if full_charuco_detected_on_this_frame[camera_one_id] and
- # full_charuco_detected_on_this_frame[
- # camera_two_id]:
- # camera_pair_joint_view_count[this_pair_num] += 1
diff --git a/src/core_processes/capture_volume_calibration/get_anipose_calibration_object.py b/src/core_processes/capture_volume_calibration/get_anipose_calibration_object.py
deleted file mode 100644
index 5a2f8202..00000000
--- a/src/core_processes/capture_volume_calibration/get_anipose_calibration_object.py
+++ /dev/null
@@ -1,87 +0,0 @@
-import logging
-import shutil
-from pathlib import Path
-from typing import Union
-
-from src.config.home_dir import (
- get_freemocap_data_folder_path,
- CAMERA_CALIBRATION_FILE_NAME,
-)
-from src.core_processes.capture_volume_calibration.anipose_camera_calibration import (
- freemocap_anipose,
-)
-
-logger = logging.getLogger(__name__)
-
-
-def load_most_recent_anipose_calibration_toml(
- save_copy_of_calibration_to_this_path: Union[str, Path] = None
-):
- session_calibration_file_path = Path(
- get_freemocap_data_folder_path(), "last_successful_calibration.toml"
- )
- logger.info(
- f"loading `most recent calibration from:{str(session_calibration_file_path)}"
- )
- if save_copy_of_calibration_to_this_path is not None:
- logger.info(
- f"Saving copy of `most_recent_calibration.toml` to {save_copy_of_calibration_to_this_path}"
- )
-
- shutil.copy(
- str(session_calibration_file_path),
- str(
- Path(save_copy_of_calibration_to_this_path)
- / CAMERA_CALIBRATION_FILE_NAME
- ),
- )
-
- return freemocap_anipose.CameraGroup.load(str(session_calibration_file_path))
-
-
-def load_anipose_calibration_toml_from_path(
- camera_calibration_data_toml_path: Union[str, Path],
- save_copy_of_calibration_to_this_path: Union[str, Path] = None,
-):
- logger.info(
- f"loading camera calibration file from:{str(camera_calibration_data_toml_path)}"
- )
- try:
- anipose_calibration_object = freemocap_anipose.CameraGroup.load(
- str(camera_calibration_data_toml_path)
- )
-
- if save_copy_of_calibration_to_this_path is not None:
- logger.info(
- f"Saving copy of {camera_calibration_data_toml_path} to {save_copy_of_calibration_to_this_path}"
- )
- shutil.copy(
- str(camera_calibration_data_toml_path),
- str(
- Path(save_copy_of_calibration_to_this_path)
- / CAMERA_CALIBRATION_FILE_NAME
- ),
- )
- return anipose_calibration_object
- except Exception as e:
- logger.error(
- f"Failed to load anipose calibration info from {str(camera_calibration_data_toml_path)}"
- )
- raise e
- return None
-
-
-def load_calibration_from_session_id(
- session_calibration_file_path: Union[str, Path],
-):
- logger.info(
- f"loading camera calibration file from:{str(session_calibration_file_path)}"
- )
- try:
-
- return freemocap_anipose.CameraGroup.load(str(session_calibration_file_path))
- except Exception as e:
- logger.error(
- f"Failed to load anipose calibration info from {str(session_calibration_file_path)}"
- )
- raise e
diff --git a/src/core_processes/capture_volume_calibration/lens_distortion_calibrator.py b/src/core_processes/capture_volume_calibration/lens_distortion_calibrator.py
deleted file mode 100644
index 35e74c11..00000000
--- a/src/core_processes/capture_volume_calibration/lens_distortion_calibrator.py
+++ /dev/null
@@ -1,390 +0,0 @@
-import cv2
-import numpy as np
-from rich import print
-
-from src.cameras.capture.dataclasses.frame_payload import FramePayload
-from src.core_processes.capture_volume_calibration.calibration_dataclasses import (
- LensDistortionCalibrationData,
-)
-from src.core_processes.capture_volume_calibration.charuco_board_detection import (
- BoardDetector,
-)
-from src.core_processes.capture_volume_calibration.calibration_diagnostics_visualizer import (
- CalibrationDiagnosticsVisualizer,
-)
-from src.core_processes.capture_volume_calibration.charuco_board_detection import (
- CharucoViewData,
-)
-from src.core_processes.capture_volume_calibration.charuco_board_detection import (
- annotate_image_with_charuco_data,
-)
-
-
-class LensDistortionCalibrator:
- def __init__(
- self,
- board_detector: BoardDetector = BoardDetector(),
- show_calibration_diagnostics_visualizer=False,
- ):
- self._board_detector = board_detector
- self._current_calibration = None
- self._all_charuco_views = []
- self._num_charuco_views = 0
- self._best_combo_of_charuco_views = []
- self._previous_best_calibrations = []
- self.show_calibration_diagnostics_visualizer = (
- show_calibration_diagnostics_visualizer
- )
- if self.show_calibration_diagnostics_visualizer:
- self.calibration_diagnostics_visualizer = CalibrationDiagnosticsVisualizer()
-
- def process_incoming_frame(self, raw_frame_payload: FramePayload):
-
- charuco_frame_payload = (
- self._board_detector.detect_charuco_board_in_frame_payload(
- raw_frame_payload
- )
- )
-
- charuco_view_data = charuco_frame_payload.charuco_view_data
-
- if not charuco_view_data.full_board_found and self._current_calibration is None:
- return charuco_frame_payload.annotated_image
-
- if charuco_view_data.full_board_found:
- self._all_charuco_views.append(charuco_view_data)
- self._num_charuco_views = len(self._all_charuco_views)
-
- if self._num_charuco_views < 2:
- return charuco_frame_payload.annotated_image
-
- self.estimate_lens_distortion(
- charuco_view_data
- ) # this is where the magic happens
-
- if self._current_calibration is None:
- self._current_calibration = LensDistortionCalibrationData(
- charuco_view_data.image_width, charuco_view_data.image_height
- )
- return raw_frame_payload.image
-
- undistorted_image_for_debug = self.undistort_image_with_invalid_pixels_as_black(
- raw_frame_payload.image, self._current_calibration
- )
- if charuco_view_data.some_charuco_corners_found:
- annotate_image_with_charuco_data(
- undistorted_image_for_debug, # this image will have stuff drawn on top of it inside this function
- charuco_view_data,
- self._board_detector.number_of_charuco_corners,
- )
-
- if self.show_calibration_diagnostics_visualizer:
- self.calibration_diagnostics_visualizer.update_image_subplot(
- undistorted_image_for_debug
- )
-
- undistorted_image = cv2.undistort(
- raw_frame_payload.image,
- self._current_calibration.camera_matrix,
- self._current_calibration.lens_distortion_coefficients,
- )
-
- return undistorted_image
-
- def estimate_lens_distortion(self, new_charuco_view: CharucoViewData):
- """
- adapted from - https://mecaruco2.readthedocs.io/en/latest/notebooks_rst/Aruco/sandbox/ludovic/aruco_calibration_rotation.html
-
- Calibrates the camera using the charuco data using a RANSAC-like method - randomly selects board views and saves the combo that minimized reprojection error
-
- helpful resources -
- https://docs.opencv.org/4.x/d9/d0c/group__calib3d.html <-opencv's 3d camera calibration docs
- https://www.adamsmith.haus/python/docs/cv2.aruco.calibrateCameraCharucoExtended
- https://www.mathworks.com/help/vision/ug/camera-calibration.html
- https://docs.opencv.org/3.4/d9/db7/tutorial_py_table_of_contents_calib3d.html
- https://calib.io/blogs/knowledge-base/camera-models <-a good one
- """
- print("CAMERA CALIBRATION")
-
- if self._current_calibration is None:
- current_best_reprojection_error = (
- 1e9 # put a big fake number on the first frame
- )
- else:
- current_best_reprojection_error = (
- self._current_calibration.reprojection_error
- )
-
- image_width = new_charuco_view.image_width
- image_height = new_charuco_view.image_height
-
- default_calibration = LensDistortionCalibrationData(image_width, image_height)
-
- num_charuco_views_per_combo = 5
- if self._num_charuco_views < num_charuco_views_per_combo:
- list_of_combos_of_charuco_views = [self._all_charuco_views]
- else:
- list_of_combos_of_charuco_views = self.generate_combos_of_charuco_views(
- new_charuco_view,
- num_combos_to_generate=10,
- num_views_per_combo=num_charuco_views_per_combo,
- )
-
- # flag definitions -> https://docs.opencv.org/4.x/d9/d0c/group__calib3d.html#ga3207604e4b1a1758aa66acb6ed5aa65d
- flags = (
- cv2.CALIB_USE_INTRINSIC_GUESS
- + cv2.CALIB_ZERO_TANGENT_DIST
- + cv2.cv2.CALIB_FIX_ASPECT_RATIO
- + cv2.CALIB_FIX_PRINCIPAL_POINT
- +
- # cv2.CALIB_FIX_FOCAL_LENGTH
- cv2.CALIB_RATIONAL_MODEL
- # cv2.CALIB_THIN_PRISM_MODEL
- # cv2.CALIB_TILTED_MODEL
- )
-
- for this_combo_of_charuco_views in list_of_combos_of_charuco_views:
- for this_charuco_view in this_combo_of_charuco_views:
- # https://docs.opencv.org/4.x/d9/d6a/group__aruco.html#gacf03e5afb0bc516b73028cf209984a06
- (
- this_reprojection_error,
- this_camera_matrix,
- these_lens_distortion_coefficients,
- these_rotation_vectors_of_the_board,
- these_translation_vectors_of_the_board,
- this_lens_distortion_std_dev,
- this_camera_location_std_dev,
- these_reprojection_error_per_view,
- ) = cv2.aruco.calibrateCameraCharucoExtended(
- charucoCorners=[this_charuco_view.charuco_corners],
- charucoIds=[this_charuco_view.charuco_ids],
- board=self._board_detector.cv2_aruco_charuco_board,
- imageSize=(image_width, image_height),
- cameraMatrix=default_calibration.camera_matrix,
- distCoeffs=default_calibration.lens_distortion_coefficients,
- flags=flags,
- criteria=(
- cv2.TERM_CRITERIA_EPS & cv2.TERM_CRITERIA_COUNT,
- 10000,
- 1e-9,
- ),
- )
-
- if self.show_calibration_diagnostics_visualizer:
- self.calibration_diagnostics_visualizer.update_reprojection_error_subplot(
- this_reprojection_error,
- current_best_reprojection_error,
- )
- if self._current_calibration is not None:
- self.calibration_diagnostics_visualizer.update_calibration_text_overlay(
- self._current_calibration
- )
-
- if this_reprojection_error < current_best_reprojection_error:
-
- this_calibration = LensDistortionCalibrationData(
- reprojection_error=this_reprojection_error,
- camera_matrix=this_camera_matrix,
- lens_distortion_coefficients=these_lens_distortion_coefficients,
- image_width=image_width,
- image_height=image_height,
- rotation_vectors_of_the_board=these_rotation_vectors_of_the_board,
- translation_vectors_of_the_board=these_translation_vectors_of_the_board,
- lens_distortion_std_dev=this_lens_distortion_std_dev,
- camera_location_std_dev=this_camera_location_std_dev,
- )
-
- if self.is_this_calibration_valid(this_calibration):
- self._current_calibration = this_calibration
- self._previous_best_calibrations.append(
- self._current_calibration
- )
-
- def generate_combos_of_charuco_views(
- self, new_charuco_view, num_combos_to_generate=10, num_views_per_combo=5
- ):
- """
- return -
- 1x current best combo plus new view
- num_combos_to_generate/2x random combo WITH new view appended
- num_combos_to_generate/2x random combo WITHOUT new view appended
- """
-
- list_of_combos_of_charuco_views = []
-
- # add default calibration (i.e. option not to change anything)
- # list_of_combos_of_charuco_views.append([self.get_default_calibration(new_charuco_view)])
-
- # add previous best view
- if self._best_combo_of_charuco_views:
- list_of_combos_of_charuco_views.append(
- self._best_combo_of_charuco_views.copy()
- )
-
- # add previous best view + new view
- best_combo_plus_new = self._best_combo_of_charuco_views.copy()
- best_combo_plus_new.append(new_charuco_view)
- list_of_combos_of_charuco_views.append(best_combo_plus_new)
-
- # add all previous best calibrations
- # list_of_combos_of_charuco_views.append([cc for cc in self._previous_best_calibrations])
-
- # and a some random combos - half with the new view and half without it
- for this_iter in range(num_combos_to_generate):
- this_random_sample_of_charuco_views = np.random.choice(
- num_views_per_combo,
- size=min(len(self._all_charuco_views), num_views_per_combo),
- replace=False,
- )
-
- this_combo = [
- self._all_charuco_views[cc]
- for cc in this_random_sample_of_charuco_views
- ]
-
- if this_iter < np.ceil(num_views_per_combo / 2):
- this_combo.append(new_charuco_view)
-
- list_of_combos_of_charuco_views.append(this_combo)
-
- return list_of_combos_of_charuco_views
-
- def is_this_calibration_valid(self, this_calibration):
-
- is_valid = False
- if not self.lens_distortion_is_monotonic(
- this_calibration
- ): # not currently working - returns True every time
- return False
-
- if self.check_if_too_many_invalid_pixels(this_calibration):
- return False
-
- return True
-
- def lens_distortion_is_monotonic(
- self, this_calibration, assume_wide_angle_lens=True
- ) -> bool:
- """
- check if the lens distortion coefficients are valid by checking it the resulting undistorted image is monotonically increasing along each diagonal (i.e. the image doesn't wrap around itself)
-
- per opencv calib3d docs, calibrations are valid if -
-
- 1 + k1*r^2 + k2*r^r + k3*r6
-
- is monotonically increasing (pincushion distortion) or monotonically decreasing (barrel distortion).
-
- non-monotonic behavior means the calibration is invalid, so we check for that by examining the `np.diff` of a vector of points extending from image center to the top left coners to make sure it never goes negative(NOTE - check other directions?)
-
- since most cameras are wide-angle (i.e. they give a wider field of view than a pinhole camera), we may constrain things further be requiring things be monotonically increasing (i.e. only return pincushion distortions to correct for the barrel distortion of a wide-angle field of view)
-
-
- see -
- https://www.mathworks.com/help/vision/ug/camera-calibration.html <- matlab docs (best ones, maybe)
- https://docs.opencv.org/4.x/d9/d0c/group__calib3d.html <-mathematical defintion of lens distortion
- https://docs.opencv.org/4.x/d9/d0c/group__calib3d.html#ga3207604e4b1a1758aa66acb6ed5aa65d <- docs explaining lens_distortion_coefficients
- https://github.com/opencv/opencv/issues/15992 <-conversation about the fact that opencv doesn't check for this kinda thing
-
- """
- calibration_valid = False
-
- # following naming conventions of open cv docs
- k1 = this_calibration.lens_distortion_coefficients[0]
- k2 = this_calibration.lens_distortion_coefficients[1]
- p1 = this_calibration.lens_distortion_coefficients[
- 2
- ] # I think p1 and p2 are for tangential distortion...
- p2 = this_calibration.lens_distortion_coefficients[
- 3
- ] # ...which I might want to check on later? Currently fixed at Zero
- k3 = this_calibration.lens_distortion_coefficients[4]
-
- number_of_points = 40
- original_x = np.linspace(this_calibration.image_width, number_of_points)
- original_y = np.linspace(this_calibration.image_height, number_of_points)
-
- original_points_xx, original_points_yy = np.meshgrid(original_x, original_y)
-
- original_points_x = (
- original_points_xx.flatten()
- ) # transform 2D grid with 1D array
- original_points_y = (
- original_points_yy.flatten()
- ) # transform 2D grid with 1D array
-
- original_points_xy = np.vstack((original_points_x, original_points_y))
-
- distorted_points_xy = cv2.undistortPoints(
- original_points_xy,
- this_calibration.camera_matrix,
- this_calibration.lens_distortion_coefficients,
- )
-
- distorted_points_x = (
- np.squeeze(distorted_points_xy[:, :, 0]) * this_calibration.image_width
- + this_calibration.image_width / 2
- )
- distorted_points_y = (
- np.squeeze(distorted_points_xy[:, :, 1]) * this_calibration.image_height
- + this_calibration.image_height / 2
- )
-
- if self.show_calibration_diagnostics_visualizer:
- self.calibration_diagnostics_visualizer.update_image_point_remapping_subplot(
- original_points_x,
- original_points_y,
- distorted_points_x,
- distorted_points_y,
- )
- return True
-
- def check_if_too_many_invalid_pixels(
- self, this_calibration, how_many_is_too_many=0.1
- ) -> bool:
- """
- create new camera matrix that will show full undistored image with black pixels in spots with no data.
- return FALSE if black pixels are greater than `how_many_is_too_many` proportion of the full image
- """
-
- dummy_image = (
- np.ones(
- (this_calibration.image_width, this_calibration.image_height), np.uint8
- )
- * 255
- )
-
- undistorted_image = self.undistort_image_with_invalid_pixels_as_black(
- dummy_image, this_calibration
- )
-
- num_invalid_pixels = np.sum(undistorted_image == 0)
- proportion_invalid_pixels = num_invalid_pixels / dummy_image.size
-
- if proportion_invalid_pixels > how_many_is_too_many:
- return True
- return False
-
- @staticmethod
- def undistort_image_with_invalid_pixels_as_black(image, calibration):
- new_camera_matrix, valid_ROI_lbwh = cv2.getOptimalNewCameraMatrix(
- calibration.camera_matrix,
- calibration.lens_distortion_coefficients,
- (calibration.image_width, calibration.image_height),
- 1,
- centerPrincipalPoint=True,
- )
-
- # https://docs.opencv.org/4.5.5/d9/d0c/group__calib3d.html#ga69f2545a8b62a6b0fc2ee060dc30559d
- undistorted_image = cv2.undistort(
- image,
- calibration.camera_matrix,
- calibration.lens_distortion_coefficients,
- None,
- new_camera_matrix,
- )
-
- return undistorted_image
-
-
-if __name__ == "__main__":
- pass
diff --git a/src/core_processes/experiments/mediapipe_testing.py b/src/core_processes/experiments/mediapipe_testing.py
deleted file mode 100644
index b5d9f1a6..00000000
--- a/src/core_processes/experiments/mediapipe_testing.py
+++ /dev/null
@@ -1,47 +0,0 @@
-import cv2
-import mediapipe as mp
-
-mp_drawing = mp.solutions.drawing_utils
-mp_drawing_styles = mp.solutions.drawing_styles
-mp_holistic = mp.solutions.holistic
-
-# For webcam input:
-cap = cv2.VideoCapture(0)
-with mp_holistic.Holistic(
- min_detection_confidence=0.5, min_tracking_confidence=0.5
-) as holistic:
- while cap.isOpened():
- success, image = cap.read()
- if not success:
- print("Ignoring empty camera frame.")
- # If loading a video, use 'break' instead of 'continue'.
- continue
-
- # To improve performance, optionally mark the image as not writeable to
- # pass by reference.
- image.flags.writeable = False
- image = cv2.cvtColor(image, cv2.COLOR_BGR2RGB)
- results = holistic.process(image)
-
- # Draw landmark annotation on the image.
- image.flags.writeable = True
- image = cv2.cvtColor(image, cv2.COLOR_RGB2BGR)
- mp_drawing.draw_landmarks(
- image,
- results.face_landmarks,
- mp_holistic.FACEMESH_CONTOURS,
- landmark_drawing_spec=None,
- connection_drawing_spec=mp_drawing_styles.get_default_face_mesh_contours_style(),
- )
- mp_drawing.draw_landmarks(
- image,
- results.pose_landmarks,
- mp_holistic.POSE_CONNECTIONS,
- landmark_drawing_spec=mp_drawing_styles.get_default_pose_landmarks_style(),
- )
- # Flip the image horizontally for a selfie-view display.
- cv2.imshow("MediaPipe Holistic", cv2.flip(image, 1))
- if cv2.waitKey(5) & 0xFF == 27:
- break
-
-cap.release()
diff --git a/src/core_processes/experiments/nested_thread_queue.py b/src/core_processes/experiments/nested_thread_queue.py
deleted file mode 100644
index 6d1c256c..00000000
--- a/src/core_processes/experiments/nested_thread_queue.py
+++ /dev/null
@@ -1,30 +0,0 @@
-import base64
-import threading
-import traceback
-from queue import Queue
-
-import orjson
-
-from src.api.services.board_detect_service import BoardDetectService
-
-
-def tryit():
- service = BoardDetectService()
- output_queue = Queue()
- t = threading.Thread(
- target=service.run_detection_on_cam_id, args=(output_queue,), daemon=True
- )
- t.start()
-
- while True:
- try:
- # success, frame = cv2.imencode('.png', image)
- image, webcam_id = output_queue.get(timeout=1)
- if image is not None:
- d = orjson.dumps({"frame": str(base64.b64encode(image.tobytes()))})
- except:
- traceback.print_exc()
-
-
-if __name__ == "__main__":
- tryit()
diff --git a/src/core_processes/experiments/threading_single_cam.py b/src/core_processes/experiments/threading_single_cam.py
deleted file mode 100644
index c3bae6ad..00000000
--- a/src/core_processes/experiments/threading_single_cam.py
+++ /dev/null
@@ -1,105 +0,0 @@
-import time
-from threading import Thread
-
-import cv2
-
-
-class WebcamStream:
- def __init__(self, stream_id=0):
- self.stream_id = stream_id # default is 0 for primary camera
-
- # opening video start stream
- self.vcap = cv2.VideoCapture(self.stream_id)
- if self.vcap.isOpened() is False:
- print("[Exiting]: Error accessing webcam stream.")
- exit(0)
- fps_input_stream = int(self.vcap.get(5))
- print("FPS of webcam hardware/input stream: {}".format(fps_input_stream))
-
- # reading a single frame from vcap stream for initializing
- self.grabbed, self.frame = self.vcap.read()
- if self.grabbed is False:
- print("[Exiting] No more frames to read")
- exit(0)
-
- # self.stopped is set to False when frames are being read from self.vcap stream
- self.stopped = True
-
- # reference to the thread for reading next available frame from input stream
- self.t = Thread(target=self.update, args=())
- self.t.daemon = (
- True # daemon threads keep running in the background while the program
- )
- # is executing
-
- # method for starting the thread for grabbing next available frame in input stream
- def start(self):
- self.stopped = False
- self.t.start()
-
- # method for reading next frame
-
- def update(self):
- while True:
- if self.stopped is True:
- break
- self.grabbed, self.frame = self.vcap.read()
- if self.grabbed is False:
- print("[Exiting] No more frames to read")
- self.stopped = True
- break
- self.vcap.release()
-
- # method for returning latest read frame
- def read(self):
- return self.frame
-
- # method called to stop reading frames
- def stop(self):
- self.stopped = True
-
- # initializing and starting multi-threaded webcam start input stream
-
-
-webcam_stream1 = WebcamStream(stream_id=0) # stream_id = 0 is for primary camera
-webcam_stream2 = WebcamStream(stream_id=1) # stream_id = 0 is for primary camera
-webcam_stream1.start()
-webcam_stream2.start()
-
-# processing frames in input stream
-num_frames_processed = 0
-start = time.time()
-while True:
- if webcam_stream1.stopped is True:
- break
- if webcam_stream2.stopped is True:
- break
- else:
- frame1 = webcam_stream1.read()
- frame2 = webcam_stream2.read()
-
- # adding a delay for simulating time taken for processing a frame
- delay = 0.03 # delay value in seconds. so, delay=1 is equivalent to 1 second
- time.sleep(delay)
- num_frames_processed += 1
-
- cv2.imshow("frame1", frame1)
- cv2.imshow("frame2", frame2)
- key = cv2.waitKey(1)
- if key == ord("q"):
- break
-end = time.time()
-webcam_stream1.stop() # stop the webcam stream
-webcam_stream2.stop() # stop the webcam stream
-
-# printing time elapsed and timestamp_manager
-elapsed = end - start
-fps = num_frames_processed / elapsed
-print(
- "FPS: {} , Elapsed Time: {} , Frames Processed: {}".format(
- fps, elapsed, num_frames_processed
- )
-)
-
-# closing all windows
-cv2.destroyAllWindows()
diff --git a/src/core_processes/log_setup.py b/src/core_processes/log_setup.py
deleted file mode 100644
index 23f7b3ff..00000000
--- a/src/core_processes/log_setup.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import logging
-
-
-def logging_setup():
- logging.getLogger("websockets.client").setLevel(level=logging.INFO)
diff --git a/src/core_processes/mediapipe_stuff/load_mediapipe2d_data.py b/src/core_processes/mediapipe_stuff/load_mediapipe2d_data.py
deleted file mode 100644
index 8823f273..00000000
--- a/src/core_processes/mediapipe_stuff/load_mediapipe2d_data.py
+++ /dev/null
@@ -1,21 +0,0 @@
-from pathlib import Path
-from typing import Union
-
-import logging
-
-import numpy as np
-
-logger = logging.getLogger(__name__)
-
-
-def load_mediapipe2d_data(output_data_folder_path: Union[str, Path]):
- mediapipe2d_xy_file_path = (
- Path(output_data_folder_path)
- / "mediapipe_2dData_numCams_numFrames_numTrackedPoints_pixelXY.npy"
- )
- logger.info(f"loading: {mediapipe2d_xy_file_path}")
- mediapipe2d_numCams_numFrames_numTrackedPoints_pixelXY = np.load(
- str(mediapipe2d_xy_file_path)
- )
-
- return mediapipe2d_numCams_numFrames_numTrackedPoints_pixelXY
diff --git a/src/core_processes/mediapipe_stuff/load_mediapipe3d_data.py b/src/core_processes/mediapipe_stuff/load_mediapipe3d_data.py
deleted file mode 100644
index fe3ea986..00000000
--- a/src/core_processes/mediapipe_stuff/load_mediapipe3d_data.py
+++ /dev/null
@@ -1,48 +0,0 @@
-from pathlib import Path
-from typing import Union
-
-import logging
-
-import numpy as np
-
-from src.config.home_dir import RAW_DATA_FOLDER_NAME, MEDIAPIPE_3D_NPY_FILE_NAME
-
-logger = logging.getLogger(__name__)
-
-
-def load_raw_mediapipe3d_data(output_data_folder_path: Union[str, Path]):
- mediapipe3d_xyz_file_path = (
- Path(output_data_folder_path)
- / RAW_DATA_FOLDER_NAME
- / MEDIAPIPE_3D_NPY_FILE_NAME
- )
- logger.info(f"loading: {mediapipe3d_xyz_file_path}")
- mediapipe_3dData_numFrames_numTrackedPoints_spatialXYZ = np.load(
- str(mediapipe3d_xyz_file_path)
- )
-
- return mediapipe_3dData_numFrames_numTrackedPoints_spatialXYZ
-
-
-def load_post_processed_mediapipe3d_data(mediapipe3d_xyz_file_path: Union[str, Path]):
-
- logger.info(f"loading: {mediapipe3d_xyz_file_path}")
- mediapipe_3dData_numFrames_numTrackedPoints_spatialXYZ = np.load(
- str(mediapipe3d_xyz_file_path)
- )
-
- return mediapipe_3dData_numFrames_numTrackedPoints_spatialXYZ
-
-
-def load_skeleton_reprojection_error_data(output_data_folder_path: Union[str, Path]):
- mediapipe3d_reprojection_error_file_path = (
- Path(output_data_folder_path)
- / "raw_data"
- / "mediapipe_3dData_numFrames_numTrackedPoints_reprojectionError.npy"
- )
- logger.info(f"loading: {mediapipe3d_reprojection_error_file_path}")
- mediapipe_3dData_numFrames_numTrackedPoints_reprojectionError = np.load(
- str(mediapipe3d_reprojection_error_file_path)
- )
-
- return mediapipe_3dData_numFrames_numTrackedPoints_reprojectionError
diff --git a/src/core_processes/mediapipe_stuff/medaipipe_tracked_points_names_dict.py b/src/core_processes/mediapipe_stuff/medaipipe_tracked_points_names_dict.py
deleted file mode 100644
index 7e92fae0..00000000
--- a/src/core_processes/mediapipe_stuff/medaipipe_tracked_points_names_dict.py
+++ /dev/null
@@ -1,91 +0,0 @@
-mediapipe_tracked_point_names_dict = {
- "body": [
- "nose",
- "left_eye_inner",
- "left_eye",
- "left_eye_outer",
- "right_eye_inner",
- "right_eye",
- "right_eye_outer",
- "left_ear",
- "right_ear",
- "mouth_left",
- "mouth_right",
- "left_shoulder",
- "right_shoulder",
- "left_elbow",
- "right_elbow",
- "left_wrist",
- "right_wrist",
- "left_pinky",
- "right_pinky",
- "left_index",
- "right_index",
- "left_thumb",
- "right_thumb",
- "left_hip",
- "right_hip",
- "left_knee",
- "right_knee",
- "left_ankle",
- "right_ankle",
- "left_heel",
- "right_heel",
- "left_foot_index",
- "right_foot_index",
- ],
- "right_hand": [
- "right_hand_wrist",
- "right_hand_thumb_cmc",
- "right_hand_thumb_mcp",
- "right_hand_thumb_ip",
- "right_hand_thumb_tip",
- "right_hand_index_finger_mcp",
- "right_hand_index_finger_pip",
- "right_hand_index_finger_dip",
- "right_hand_index_finger_tip",
- "right_hand_middle_finger_mcp",
- "right_hand_middle_finger_pip",
- "right_hand_middle_finger_dip",
- "right_hand_middle_finger_tip",
- "right_hand_ring_finger_mcp",
- "right_hand_ring_finger_pip",
- "right_hand_ring_finger_dip",
- "right_hand_ring_finger_tip",
- "right_hand_pinky_finger_mcp",
- "right_hand_pinky_finger_pip",
- "right_hand_pinky_finger_dip",
- "right_hand_pinky_finger_tip",
- ],
- "left_hand": [
- "left_hand_wrist",
- "left_hand_thumb_cmc",
- "left_hand_thumb_mcp",
- "left_hand_thumb_ip",
- "left_hand_thumb_tip",
- "left_hand_index_finger_mcp",
- "left_hand_index_finger_pip",
- "left_hand_index_finger_dip",
- "left_hand_index_finger_tip",
- "left_hand_middle_finger_mcp",
- "left_hand_middle_finger_pip",
- "left_hand_middle_finger_dip",
- "left_hand_middle_finger_tip",
- "left_hand_ring_finger_mcp",
- "left_hand_ring_finger_pip",
- "left_hand_ring_finger_dip",
- "left_hand_ring_finger_tip",
- "left_hand_pinky_finger_mcp",
- "left_hand_pinky_finger_pip",
- "left_hand_pinky_finger_dip",
- "left_hand_pinky_finger_tip",
- ],
- "face": [
- "right_eye",
- "left_eye",
- "nose_tip",
- "mouth_center",
- "right_ear_tragion",
- "left_ear_tragion",
- ],
-}
diff --git a/src/core_processes/mediapipe_stuff/mediapipe_default_settings.py b/src/core_processes/mediapipe_stuff/mediapipe_default_settings.py
deleted file mode 100644
index 59a046e8..00000000
--- a/src/core_processes/mediapipe_stuff/mediapipe_default_settings.py
+++ /dev/null
@@ -1,3 +0,0 @@
-default_mediapipe_confidence_threshold = 0.7
-
-# TO DO - add `model complexity` [0,1,2], `static image mode` [bool], and 'confidence to track' stuff
diff --git a/src/core_processes/mediapipe_stuff/mediapipe_skeleton_names_and_connections.py b/src/core_processes/mediapipe_stuff/mediapipe_skeleton_names_and_connections.py
deleted file mode 100644
index 11637e94..00000000
--- a/src/core_processes/mediapipe_stuff/mediapipe_skeleton_names_and_connections.py
+++ /dev/null
@@ -1,17 +0,0 @@
-from mediapipe.python.solutions import holistic as mp_holistic
-
-mediapipe_body_connections = [connection for connection in mp_holistic.POSE_CONNECTIONS]
-
-mediapipe_hand_connections = [connection for connection in mp_holistic.HAND_CONNECTIONS]
-
-mediapipe_face_connections = [
- connection for connection in mp_holistic.FACEMESH_TESSELATION
-]
-
-mediapipe_body_landmark_names = [
- landmark.name.lower() for landmark in mp_holistic.PoseLandmark
-]
-
-mediapipe_hand_landmark_names = [
- landmark.name.lower() for landmark in mp_holistic.HandLandmark
-]
diff --git a/src/core_processes/show_cam_window.py b/src/core_processes/show_cam_window.py
deleted file mode 100644
index 82b6bd12..00000000
--- a/src/core_processes/show_cam_window.py
+++ /dev/null
@@ -1,17 +0,0 @@
-import logging
-
-import cv2
-import numpy as np
-
-from src.core_processes.timestamp_manager.timestamp_manager import TimestampManager
-from src.core_processes.utils.image_fps_writer import write_fps_to_image
-
-logger = logging.getLogger(__name__)
-
-
-def show_cam_window(
- webcam_id: str,
- image: np.array,
-):
- cv2.imshow(webcam_id, image)
- return True
diff --git a/src/core_processes/timestamp_manager/timestamp_manager.py b/src/core_processes/timestamp_manager/timestamp_manager.py
deleted file mode 100644
index d8366d36..00000000
--- a/src/core_processes/timestamp_manager/timestamp_manager.py
+++ /dev/null
@@ -1,141 +0,0 @@
-import logging
-from pathlib import Path
-from typing import Dict, List
-
-import numpy as np
-
-
-from src.config.home_dir import get_session_folder_path
-
-
-logger = logging.getLogger(__name__)
-
-
-class TimestampLogger:
- def __init__(
- self,
- logger_name: str,
- session_start_time_perf_counter_ns: int,
- ):
- self._logger_name = logger_name
- self._session_start_time_perf_counter_ns = session_start_time_perf_counter_ns
- self._num_frames_processed = 0
- self._timestamps_perf_counter_ns = np.empty(0)
- self._timestamps_from_zero = np.empty(0)
-
- @property
- def median_frames_per_second(self):
- if self._num_frames_processed <= 10:
- return 0
- return np.nanmedian(np.diff(self._timestamps_perf_counter_ns) / 1e9) ** -1
-
- @property
- def number_of_frames(self):
- return self._num_frames_processed
-
- @property
- def timestamps_in_seconds_from_session_start(self):
- """timestamps in seconds counting up from zero (where zero is the start time of the recording session)"""
- return (
- self._timestamps_perf_counter_ns - self._session_start_time_perf_counter_ns
- ) / 1e9
-
- @property
- def latest_timestamp_in_seconds_from_record_start(self):
- """returns timestamps in seconds from session start"""
- try:
- if self.timestamps_in_seconds_from_session_start.shape[0] > 0:
- return self.timestamps_in_seconds_from_session_start[-1]
- except:
- logger.error(f"Failed to return latest timestamp")
-
- def log_new_timestamp_perf_counter_ns(self, timestamp: int):
- self._timestamps_perf_counter_ns = np.append(
- self._timestamps_perf_counter_ns, timestamp
- )
- self._num_frames_processed += 1
-
- def log_new_timestamp_seconds_from_unspecified_zero(self, timestamp: float):
- self._timestamps_from_zero = np.append(self._timestamps_from_zero, timestamp)
- self._num_frames_processed += 1
-
- @property
- def timestamps_in_seconds_from_unspecified_zero(self):
- return self._timestamps_from_zero
-
-
-class TimestampManager:
- def __init__(
- self,
- session_id: str,
- webcam_ids: List[str],
- session_start_time_unix_ns: int,
- _session_start_time_perf_counter_ns: int,
- ):
-
- self._session_id = session_id
- self._session_start_time_unix_ns = session_start_time_unix_ns
- self._session_start_time_perf_counter_ns = _session_start_time_perf_counter_ns
-
- self._webcam_ids = webcam_ids
- self._webcam_timestamp_loggers: Dict[
- str, TimestampLogger
- ] = self._initialize_webcam_timestamp_loggers(webcam_ids)
- self._main_loop_timestamp_logger = TimestampLogger(
- logger_name="main_loop",
- session_start_time_perf_counter_ns=self._session_start_time_perf_counter_ns,
- )
-
- self._multi_frame_timestamp_logger = TimestampLogger(
- logger_name="multi_frame",
- session_start_time_perf_counter_ns=self._session_start_time_perf_counter_ns,
- )
-
- def timestamp_logger_for_webcam_id(self, webcam_id: str) -> TimestampLogger:
- return self._webcam_timestamp_loggers[webcam_id]
-
- @property
- def multi_frame_timestamp_logger(self):
- return self._multi_frame_timestamp_logger
-
- def _initialize_webcam_timestamp_loggers(self, webcam_ids: List[str]):
- dictionary_of_timestamp_logger_objects = {}
- for webcam_id in webcam_ids:
- dictionary_of_timestamp_logger_objects[webcam_id] = TimestampLogger(
- logger_name="camera_" + webcam_id,
- session_start_time_perf_counter_ns=self._session_start_time_perf_counter_ns,
- )
- return dictionary_of_timestamp_logger_objects
-
- def _get_each_frame_timestamp(self, this_multi_frame_dict) -> List:
- this_multi_frame_timestamps = []
- for this_cam_id, this_cam_frame in this_multi_frame_dict.items():
- this_multi_frame_timestamps.append(
- this_cam_frame.timestamp_in_seconds_from_record_start
- )
- return this_multi_frame_timestamps
-
- def _get_intra_frame_interval_in_seconds(
- self, this_multi_frame_timestamps_in_seconds
- ) -> float:
- timestamp_min = np.min(this_multi_frame_timestamps_in_seconds)
- timestamp_max = np.max(this_multi_frame_timestamps_in_seconds)
- return timestamp_max - timestamp_min
-
- def verify_multi_frame_is_synchronized(
- self,
- this_multi_frame_dict,
- ) -> bool:
-
- this_multi_frame_timestamps = self._get_each_frame_timestamp(
- this_multi_frame_dict
- )
- this_multiframe_timestamp_interval_in_seconds = (
- self._get_intra_frame_interval_in_seconds(this_multi_frame_timestamps)
- )
-
- print(
- f"this_multiframe_timestamp_interval: {this_multiframe_timestamp_interval_in_seconds*1e3:.6f} milliseconds"
- )
-
- return True
diff --git a/src/core_processes/utils/image_fps_writer.py b/src/core_processes/utils/image_fps_writer.py
deleted file mode 100644
index e60c83fe..00000000
--- a/src/core_processes/utils/image_fps_writer.py
+++ /dev/null
@@ -1,19 +0,0 @@
-from typing import Union
-
-import cv2
-import numpy as np
-
-
-def write_fps_to_image(image: np.array, fps_number: Union[int, float]) -> np.ndarray:
- annotated_image = image.copy()
- cv2.putText(
- annotated_image,
- f"FPS: {str(fps_number)}",
- (10, 15),
- cv2.FONT_HERSHEY_SIMPLEX,
- 1,
- (209, 180, 0, 255),
- 1,
- )
-
- return annotated_image
diff --git a/src/diagnostic_plot_makers/create_3d_data_diagnostic_plots.py b/src/diagnostic_plot_makers/create_3d_data_diagnostic_plots.py
deleted file mode 100644
index b93e1fb4..00000000
--- a/src/diagnostic_plot_makers/create_3d_data_diagnostic_plots.py
+++ /dev/null
@@ -1,61 +0,0 @@
-import logging
-from pathlib import Path
-from typing import Union
-
-import numpy as np
-
-from src.core_processes.mediapipe_stuff.mediapipe_skeleton_names_and_connections import (
- mediapipe_body_landmark_names,
-)
-
-logger = logging.getLogger(__name__)
-
-
-def create_3d_data_diagnostic_plots(
- spatial_data3d_numFrames_numTrackedPoints_XYZ: np.ndarray,
- reprojection_error_data3d_numCams_numFrames_numTrackedPoints_error: np.ndarray,
- path_to_save_plots: Union[str, Path],
-):
- """
- Create diagnostic plots for spot checking 3d data
- """
-
- logger.info("Creating 3d data diagnostic plots")
- # opportunistic load of matplotlib to avoid startup time costs
- from matplotlib import pyplot as plt
-
- plt.set_loglevel("warning")
-
- mean_reprojection_error_numFrames_numLandmark = np.mean(
- reprojection_error_data3d_numCams_numFrames_numTrackedPoints_error, axis=0
- )
-
- fig = plt.figure(figsize=(18, 10))
- ax1 = plt.subplot(411, title="X Data", xlabel="Frame#", ylabel="X position(mm)")
- ax2 = plt.subplot(412, title="Y Data", xlabel="Frame#", ylabel="Y position(mm)")
- ax3 = plt.subplot(413, title="Z Data", xlabel="Frame#", ylabel="Z position(mm)")
- ax4 = plt.subplot(
- 414, title="Reprojection Error", xlabel="Frame#", ylabel="Error(mm)"
- )
-
- ax1.plot(spatial_data3d_numFrames_numTrackedPoints_XYZ[:, :, 0])
- ax1.legend(mediapipe_body_landmark_names)
-
- ax2.plot(spatial_data3d_numFrames_numTrackedPoints_XYZ[:, :, 1])
- ax2.legend(mediapipe_body_landmark_names)
-
- ax3.plot(spatial_data3d_numFrames_numTrackedPoints_XYZ[:, :, 2])
- ax3.legend(mediapipe_body_landmark_names)
-
- ax4.plot(mean_reprojection_error_numFrames_numLandmark[:, :, 0])
- ax4.legend(mediapipe_body_landmark_names)
-
- fig.savefig(path_to_save_plots)
-
- logger.info(f"Saving diagnostic figure as png")
- import matplotlib
-
- matplotlib.use("QtAgg")
- plt.show()
- plt.pause(0.1)
- f = 9
diff --git a/src/diagnostic_plot_makers/create_timestamp_diagnostic_plots.py b/src/diagnostic_plot_makers/create_timestamp_diagnostic_plots.py
deleted file mode 100644
index 2117881a..00000000
--- a/src/diagnostic_plot_makers/create_timestamp_diagnostic_plots.py
+++ /dev/null
@@ -1,109 +0,0 @@
-import logging
-from pathlib import Path
-from typing import Union, Dict, List
-
-import numpy as np
-
-from src.cameras.capture.dataclasses.frame_payload import FramePayload
-
-logger = logging.getLogger(__name__)
-
-
-def gather_timestamps(list_of_frames: List[FramePayload]) -> np.ndarray:
- timestamps_npy = np.empty(0)
-
- for frame in list_of_frames:
- timestamps_npy = np.append(
- timestamps_npy, frame.timestamp_in_seconds_from_record_start
- )
- return timestamps_npy
-
-
-def create_timestamp_diagnostic_plots(
- each_cam_raw_frame_list: List[List[FramePayload]],
- each_cam_synchronized_frame_list: List[List[FramePayload]],
- path_to_save_plots: Union[str, Path],
-):
- """plot some diagnostics to assess quality of camera sync"""
-
- # opportunistic load of matplotlib to avoid startup time costs
- from matplotlib import pyplot as plt
-
- plt.set_loglevel("warning")
-
- each_cam_synchronized_timestamps = []
-
- for cam_frame_list in each_cam_synchronized_frame_list:
- each_cam_synchronized_timestamps.append(gather_timestamps(cam_frame_list))
-
- each_cam_raw_timestamps = []
- for cam_frame_list in each_cam_raw_frame_list:
- each_cam_raw_timestamps.append(gather_timestamps(cam_frame_list))
-
- fig = plt.figure(figsize=(18, 10))
- max_frame_duration = 0.1
- ax1 = plt.subplot(
- 231,
- title="(Raw) Camera Frame Timestamp vs Frame#",
- xlabel="Frame#",
- ylabel="Timestamp (sec)",
- )
- ax2 = plt.subplot(
- 232,
- ylim=(0, max_frame_duration),
- title="(Raw) Camera Frame Duration Trace",
- xlabel="Frame#",
- ylabel="Duration (sec)",
- )
- ax3 = plt.subplot(
- 233,
- xlim=(0, max_frame_duration),
- title="(Raw) Camera Frame Duration Histogram (count)",
- xlabel="Duration(s, 1ms bins)",
- ylabel="Probability",
- )
- ax4 = plt.subplot(
- 234,
- title="(Synchronized) Camera Frame Timestamp vs Frame#",
- xlabel="Frame#",
- ylabel="Timestamp (sec)",
- )
- ax5 = plt.subplot(
- 235,
- ylim=(0, max_frame_duration),
- title="(Synchronized) Camera Frame Duration Trace",
- xlabel="Frame#",
- ylabel="Duration (sec)",
- )
- ax6 = plt.subplot(
- 236,
- xlim=(0, max_frame_duration),
- title="(Synchronized) Camera Frame Duration Histogram (count)",
- xlabel="Duration(s, 1ms bins)",
- ylabel="Probability",
- )
-
- for camera_number, timestamps in enumerate(each_cam_raw_timestamps):
- ax1.plot(timestamps, label=f"Camera# {str(camera_number)}")
- ax1.legend()
- ax2.plot(np.diff(timestamps), ".")
- ax3.hist(
- np.diff(timestamps),
- bins=np.arange(0, max_frame_duration, 0.0025),
- alpha=0.5,
- )
-
- for camera_number, timestamps in enumerate(each_cam_synchronized_timestamps):
- ax4.plot(timestamps, label=f"Camera# {str(camera_number)}")
- ax4.legend()
- ax5.plot(np.diff(timestamps), ".")
- ax6.hist(
- np.diff(timestamps),
- bins=np.arange(0, max_frame_duration, 0.0025),
- alpha=0.5,
- )
-
- fig_save_path = Path(path_to_save_plots)
- plt.savefig(str(fig_save_path))
- logger.info(f"Saving diagnostic figure as png")
- # plt.show()
diff --git a/src/diagnostic_plot_makers/simple_plot_3d_points.py b/src/diagnostic_plot_makers/simple_plot_3d_points.py
deleted file mode 100644
index 11c66840..00000000
--- a/src/diagnostic_plot_makers/simple_plot_3d_points.py
+++ /dev/null
@@ -1,22 +0,0 @@
-import matplotlib
-from matplotlib import pyplot as plt
-
-
-def simple_plot_3d(data_pt_xyz):
- x = data_pt_xyz[:, 0]
- y = data_pt_xyz[:, 1]
- z = data_pt_xyz[:, 2]
-
- fig = plt.figure()
- matplotlib.use("qtagg")
- ax3d = fig.add_subplot(projection="3d")
- ax3d.scatter(x, y, z)
- plt.pause(0.1)
- plt.show()
-
-
-if __name__ == "__main__":
- import numpy as np
-
- data_pt_xyz = np.array([[1, 2, 3], [4, 5, 6], [7, 8, 9]])
- simple_plot_3d(data_pt_xyz)
diff --git a/src/experiments/cv_cam_multi_process.py b/src/experiments/cv_cam_multi_process.py
deleted file mode 100644
index 58514816..00000000
--- a/src/experiments/cv_cam_multi_process.py
+++ /dev/null
@@ -1,101 +0,0 @@
-import logging
-import multiprocessing
-import platform
-import time
-import traceback
-from multiprocessing import Process
-
-import cv2
-
-from src.cameras.capture.dataclasses.frame_payload import FramePayload
-from src.cameras.webcam_config import WebcamConfig
-
-logger = logging.getLogger(__name__)
-
-
-class CvCamByProcess:
- def __init__(self, config: WebcamConfig = WebcamConfig()):
- self._process: Process = None
- self._recv, self._send = multiprocessing.Pipe(duplex=False)
- self._config = config
- self._is_capturing_frames = False
- self._new_frame_ready = False
-
- @property
- def webcam_id(self):
- return self._config.webcam_id
-
- @property
- def current_image(self) -> FramePayload:
- if self._is_capturing_frames:
- return self._recv.recv()
- return None
-
- def begin_frame_capture(self):
- if not self._is_capturing_frames:
- self._is_capturing_frames = True
- self._process = Process(target=self._start_frame_loop, args=(self._send,))
- self._process.start()
-
- def end_frame_capture(self):
- self._is_capturing_frames = False
- self._process.kill()
- self._process = None
-
- def _create_obj(self, config: WebcamConfig):
- if platform.system() == "Windows":
- cap_backend = cv2.CAP_DSHOW
- else:
- cap_backend = cv2.CAP_ANY
-
- opencv_video_capture_object = cv2.VideoCapture(config.webcam_id, cap_backend)
- # self._apply_configuration()
- if not self._test_cap_connection(opencv_video_capture_object):
- raise Exception("Could not find camera")
-
- logger.debug(f"Camera found at port number {config.webcam_id}")
- fps_input_stream = int(opencv_video_capture_object.get(5))
- logger.debug(f"FPS of webcam hardware/input stream: {fps_input_stream}")
- return opencv_video_capture_object
-
- def _test_cap_connection(self, video_obj: cv2.VideoCapture):
- success, image = video_obj.read()
-
- if not success or image is None:
- logger.error(
- "Could not connect to a camera at port# {}".format(
- self._config.webcam_id
- )
- )
- return False
-
- return True
-
- def _start_frame_loop(self, conn):
- video_cap = self._create_obj(self._config)
- try:
- while self._is_capturing_frames:
- payload = self._get_next_frame(video_cap)
- conn.send(payload)
- except:
- logger.error("Frame loop thread exited due to error")
- traceback.print_exc()
- else:
- logger.info("Frame loop exited.")
-
- def _get_next_frame(self, video_cap: cv2.VideoCapture):
- # Why `grab()` not `read()`? see ->
- # https://stackoverflow.com/questions/57716962/difference-between-video-capture-read-and
- # -grab
- if not video_cap.grab():
- return FramePayload(False, None, None)
-
- timestamp_ns_pre = time.perf_counter_ns()
- success, image = video_cap.retrieve()
- timestamp_ns_post = time.perf_counter_ns()
-
- timestamp_ns = (timestamp_ns_pre + timestamp_ns_post) / 2
-
- self._new_frame_ready = success
-
- return FramePayload(success=success, image=image, timestamp=timestamp_ns)
diff --git a/src/experiments/pyuvc_experiment.py b/src/experiments/pyuvc_experiment.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/experiments/viewers.py b/src/experiments/viewers.py
deleted file mode 100644
index f5d51a51..00000000
--- a/src/experiments/viewers.py
+++ /dev/null
@@ -1,21 +0,0 @@
-import asyncio
-
-from src.cameras.capture.opencv_camera.opencv_camera import OpenCVCamera
-from src.cameras.detection.cam_singleton import get_or_create_cams
-from src.cameras.webcam_config import WebcamConfig
-
-
-async def imshow_testing():
- cams = get_or_create_cams()
- cvcams = []
- for info in cams.cameras_found_list:
- c = OpenCVCamera(WebcamConfig(webcam_id=info.webcam_id))
- c.connect()
- c.start_frame_capture_thread()
- cvcams.append(c)
-
- await asyncio.gather(*[cam.show() for cam in cvcams])
-
-
-if __name__ == "__main__":
- asyncio.run(imshow_testing())
diff --git a/src/gui/examples/main.py b/src/gui/examples/main.py
deleted file mode 100644
index 1db19fe7..00000000
--- a/src/gui/examples/main.py
+++ /dev/null
@@ -1,40 +0,0 @@
-import sys
-from PyQt6.QtWidgets import QWidget, QPushButton, QHBoxLayout, QVBoxLayout, QApplication
-
-
-class Example(QWidget):
- def __init__(self):
- super().__init__()
-
- self.initUI()
-
- def initUI(self):
-
- okButton = QPushButton("OK")
- cancelButton = QPushButton("Cancel")
-
- hbox = QHBoxLayout()
- hbox.addStretch(1)
- hbox.addWidget(okButton)
- hbox.addWidget(cancelButton)
-
- vbox = QVBoxLayout()
- vbox.addStretch(1)
- vbox.addLayout(hbox)
-
- self.setLayout(vbox)
-
- self.setGeometry(300, 300, 350, 250)
- self.setWindowTitle("Buttons")
- self.show()
-
-
-def main():
-
- app = QApplication(sys.argv)
- ex = Example()
- sys.exit(app.exec())
-
-
-if __name__ == "__main__":
- main()
diff --git a/src/gui/icis_conference_main/__init__.py b/src/gui/icis_conference_main/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/gui/icis_conference_main/icis_conference_app.py b/src/gui/icis_conference_main/icis_conference_app.py
deleted file mode 100644
index 26ec678c..00000000
--- a/src/gui/icis_conference_main/icis_conference_app.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from pyqtgraph import mkQApp
-
-APP = None
-
-
-def get_qt_app():
- global APP
- if APP is None:
- APP = mkQApp()
-
- return APP
diff --git a/src/gui/icis_conference_main/icis_conference_main.py b/src/gui/icis_conference_main/icis_conference_main.py
deleted file mode 100644
index 7fee737b..00000000
--- a/src/gui/icis_conference_main/icis_conference_main.py
+++ /dev/null
@@ -1,33 +0,0 @@
-import signal
-import sys
-
-from PyQt6.QtCore import QTimer
-from PyQt6.QtWidgets import QApplication
-
-# from src.api.routes.session.session_router import visualize_session_offline
-from src.gui.icis_conference_main.icis_conference_app import get_qt_app
-from src.gui.icis_conference_main.layout.ICIS_conference_main_window import (
- ICISConferenceMainWindow,
-)
-from src.gui.icis_conference_main.layout.slop_main_window import SlopMainWindow
-
-
-def sigint_handler(*args):
- """Handler for the SIGINT signal."""
- QApplication.quit()
-
-
-if __name__ == "__main__":
- signal.signal(signal.SIGINT, sigint_handler)
- app = get_qt_app()
- timer = QTimer()
- timer.start(500)
- timer.timeout.connect(
- lambda: None
- ) # Let the interpreter calculate_center_of_mass each 500 ms.
- win = ICISConferenceMainWindow()
- # win = SlopMainWindow()
- win.show()
- sys.exit(app.exec())
- # app.exec()
- # visualize_session_offline()
diff --git a/src/gui/icis_conference_main/layout/ICIS_conference_main_window.py b/src/gui/icis_conference_main/layout/ICIS_conference_main_window.py
deleted file mode 100644
index fc532724..00000000
--- a/src/gui/icis_conference_main/layout/ICIS_conference_main_window.py
+++ /dev/null
@@ -1,128 +0,0 @@
-from PyQt6.QtCore import Qt
-from PyQt6.QtGui import QAction
-from PyQt6.QtWidgets import QMainWindow, QMenuBar, QVBoxLayout, QWidget, QCheckBox
-
-from src.gui.icis_conference_main.icis_conference_app import get_qt_app
-from src.gui.icis_conference_main.qt_utils.clear_layout import clearLayout
-from src.gui.icis_conference_main.qt_widgets.jupyter_console_widget import (
- JupyterConsoleWidget,
-)
-from src.gui.icis_conference_main.state.app_state import APP_STATE
-from src.gui.icis_conference_main.workflows.calibration_instructions import (
- CalibrationInstructions,
-)
-from src.gui.icis_conference_main.workflows.camera_configuration import (
- CameraConfiguration,
-)
-from src.gui.icis_conference_main.workflows.new_recording_session import (
- NewRecordingSession,
-)
-from src.gui.icis_conference_main.workflows.record_videos import RecordVideos
-from src.gui.icis_conference_main.workflows.show_cams_charuco import ShowCamsCharuco
-from src.gui.icis_conference_main.workflows.welcome import Welcome
-
-
-class ICISConferenceMainWindow(QMainWindow):
- def __init__(self):
- super().__init__()
- self.setWindowTitle("freemocap")
- self.setGeometry(0, 0, 800, 600)
- self._create_menu_bar()
- self.statusBar()
- self._main_layout = self._create_basic_layout()
- self._jupyter_console_widget = self._add_jupyter_console_widget()
- self._show_welcome_screen()
-
- def _create_basic_layout(self):
- main_layout = QVBoxLayout()
- widget = QWidget()
- widget.setLayout(main_layout)
-
- self.setCentralWidget(widget)
- return main_layout
-
- def _create_menu_bar(self):
- menubar = self.menuBar()
- menubar.setNativeMenuBar(False)
- self._add_file_menu(menubar)
-
- def _add_file_menu(self, menubar: QMenuBar):
- exit_action = self._create_exit_action()
- record_action = self._create_new_recording_session_action()
- file_menu = menubar.addMenu("&File")
- file_menu.addAction(record_action)
- file_menu.addAction(exit_action)
-
- def _create_exit_action(self):
- # src/freemocap_qt_gui/conference/assets/new_recording_session.png
- action = QAction("&Quit", self)
- action.setShortcut("Ctrl+Q")
- action.setStatusTip("Exit application")
-
- # On triggered, quit the application
- action.triggered.connect(get_qt_app().quit)
-
- return action
-
- def _create_new_recording_session_action(self):
- action = QAction("&New Recording Session", self)
- action.setShortcut("Ctrl+N")
- action.setStatusTip("Begin a new recording session")
-
- # On triggered, quit the application
- action.triggered.connect(self._show_recording_session_screen)
- return action
-
- def _add_jupyter_console_widget(self):
- # create jupyter console widget
- jupyter_console_widget = JupyterConsoleWidget()
- get_qt_app().aboutToQuit.connect(jupyter_console_widget.shutdown_kernel)
- return jupyter_console_widget
-
- # more top-level screens go here
- # this will be refactored later
- def _show_welcome_screen(self):
- clearLayout(self._main_layout)
- screen = Welcome()
- self._main_layout.addWidget(screen)
- self._main_layout.setAlignment(Qt.AlignmentFlag.AlignTop)
- screen.new_session.clicked.connect(self._show_recording_session_screen)
-
- def _show_recording_session_screen(self):
- clearLayout(self._main_layout)
- screen = NewRecordingSession()
- self._main_layout.addWidget(screen)
- self._main_layout.setAlignment(Qt.AlignmentFlag.AlignTop)
- screen.submit.clicked.connect(self._show_cam_config_screen)
-
- def _show_cam_config_screen(self):
- clearLayout(self._main_layout)
- screen = CameraConfiguration()
- self._main_layout.addWidget(screen)
- self._main_layout.setAlignment(Qt.AlignmentFlag.AlignTop)
- # screen.config_accepted.clicked.connect(self._show_calibration_instructions_screen)
- if APP_STATE.use_previous_calibration_box_is_checked:
- screen.config_accepted.clicked.connect(self._show_record_videos_screen)
- else:
- screen.config_accepted.clicked.connect(self._show_calibration_screen)
-
- # def _show_calibration_instructions_screen(self):
- # clear_layout(self._main_layout)
- # screen = CalibrationInstructions()
- # self._main_layout.addWidget(screen)
- # self._main_layout.setAlignment(Qt.AlignmentFlag.AlignTop)
- # screen.continue_button.clicked.connect(self._show_calibration_screen)
-
- def _show_calibration_screen(self):
- clearLayout(self._main_layout)
- screen = ShowCamsCharuco()
- self._main_layout.addWidget(screen)
- self._main_layout.setAlignment(Qt.AlignmentFlag.AlignTop)
- self._main_layout.addWidget(self._jupyter_console_widget)
- screen.continue_button.clicked.connect(self._show_record_videos_screen)
-
- def _show_record_videos_screen(self):
- clearLayout(self._main_layout)
- screen = RecordVideos()
- self._main_layout.addWidget(screen)
- self._main_layout.setAlignment(Qt.AlignmentFlag.AlignTop)
diff --git a/src/gui/icis_conference_main/layout/slop_main_window.py b/src/gui/icis_conference_main/layout/slop_main_window.py
deleted file mode 100644
index 3edcdf4e..00000000
--- a/src/gui/icis_conference_main/layout/slop_main_window.py
+++ /dev/null
@@ -1,192 +0,0 @@
-from PyQt6.QtCore import Qt
-from PyQt6.QtGui import QAction
-from PyQt6.QtWidgets import (
- QMainWindow,
- QMenuBar,
- QWidget,
- QHBoxLayout,
- QGridLayout,
- QVBoxLayout,
- QLabel,
- QFrame,
- QSplitter,
-)
-
-from src.gui.icis_conference_main.icis_conference_app import get_qt_app
-from src.gui.icis_conference_main.qt_utils.clear_layout import clearLayout
-from src.gui.icis_conference_main.qt_widgets.jupyter_console_widget import (
- JupyterConsoleWidget,
-)
-from src.gui.icis_conference_main.state.app_state import APP_STATE
-from src.gui.icis_conference_main.workflows.calibration_instructions import (
- CalibrationInstructions,
-)
-from src.gui.icis_conference_main.workflows.camera_configuration import (
- CameraConfiguration,
-)
-from src.gui.icis_conference_main.workflows.new_recording_session import (
- NewRecordingSession,
-)
-from src.gui.icis_conference_main.workflows.record_videos import RecordVideos
-from src.gui.icis_conference_main.workflows.show_cams_charuco import ShowCamsCharuco
-from src.gui.icis_conference_main.workflows.welcome import Welcome
-
-
-class SlopMainWindow(QMainWindow):
- def __init__(self):
- super().__init__()
- self.setWindowTitle("freemocap")
- self._main_window_width = int(1920 * 0.8)
- self._main_window_height = int(1080 * 0.8)
- self.setGeometry(0, 0, self._main_window_width, self._main_window_height)
- self._create_menu_bar()
- self.statusBar()
- self._main_layout = self._create_basic_layout()
-
- self._control_panel_layout = self._create_control_panel_layout()
- self._camera_view_panel_layout = self._create_camera_view_panel_layout()
-
- self._jupyter_console_widget = self._create_jupyter_console_widget()
- self._console_panel_layout = self._create_console_panel_layout(
- self._jupyter_console_widget
- )
-
- self._jupyter_console_widget.print("Hello there!")
- self._show_welcome_view()
-
- def _create_basic_layout(self):
- main_layout = QHBoxLayout()
- widget = QWidget()
- widget.setLayout(main_layout)
-
- self.setCentralWidget(widget)
- return main_layout
-
- def _create_control_panel_layout(self):
- control_panel_frame = QFrame()
- control_panel_frame.setFixedWidth(self._main_window_width * 0.2)
- control_panel_frame.setFrameShape(QFrame.Shape.StyledPanel)
- control_panel_layout = QVBoxLayout()
- control_panel_frame.setLayout(control_panel_layout)
- splitter = QSplitter(Qt.Orientation.Vertical)
- splitter.addWidget((control_panel_frame))
- self._main_layout.addWidget(splitter)
- return control_panel_layout
-
- def _create_camera_view_panel_layout(self):
- camera_view_panel_frame = QFrame()
- camera_view_panel_frame.setFixedWidth(self._main_window_width * 0.4)
- camera_view_panel_frame.setFrameShape(QFrame.Shape.StyledPanel)
- camera_view_panel_layout = QVBoxLayout()
- camera_view_panel_frame.setLayout(camera_view_panel_layout)
- splitter = QSplitter(Qt.Orientation.Vertical)
- splitter.addWidget((camera_view_panel_frame))
- self._main_layout.addWidget(splitter)
- return camera_view_panel_layout
-
- def _create_console_panel_layout(self, jupyter_console_widget):
- console_panel_frame = QFrame()
- console_panel_frame.setFixedWidth(self._main_window_width * 0.4)
- console_panel_frame.setFrameShape(QFrame.Shape.StyledPanel)
- console_panel_layout = QVBoxLayout()
- console_panel_layout.addWidget(jupyter_console_widget)
- console_panel_frame.setLayout(console_panel_layout)
- splitter = QSplitter(Qt.Orientation.Vertical)
- splitter.addWidget((console_panel_frame))
- self._main_layout.addWidget(splitter)
- return console_panel_layout
-
- def _create_menu_bar(self):
- menubar = self.menuBar()
- menubar.setNativeMenuBar(False)
- self._add_file_menu(menubar)
-
- def _add_file_menu(self, menubar: QMenuBar):
- exit_action = self._create_exit_action()
- record_action = self._create_new_recording_session_action()
- file_menu = menubar.addMenu("&File")
- file_menu.addAction(record_action)
- file_menu.addAction(exit_action)
-
- def _create_exit_action(self):
- # src/freemocap_qt_gui/conference/assets/new_recording_session.png
- action = QAction("&Quit", self)
- action.setShortcut("Ctrl+Q")
- action.setStatusTip("Exit application")
-
- # On triggered, quit the application
- action.triggered.connect(get_qt_app().quit)
-
- return action
-
- def _create_new_recording_session_action(self):
- action = QAction("&New Recording Session", self)
- action.setShortcut("Ctrl+N")
- action.setStatusTip("Begin a new recording session")
-
- # On triggered, quit the application
- # action.triggered.connect(self._show_welcome_view)
- action.triggered.connect(self._show_cam_config_screen)
- return action
-
- def _create_jupyter_console_widget(self):
- # create jupyter console widget
- jupyter_console_widget = JupyterConsoleWidget()
- get_qt_app().aboutToQuit.connect(jupyter_console_widget.shutdown_kernel)
-
- return jupyter_console_widget
-
- # # more top-level screens go here
- # # this will be refactored later
- # def _show_welcome_screen(self):
- # clear_layout(self._main_layout)
- # screen = Welcome()
- # self._main_layout.addWidget(screen)
- # self._main_layout.setAlignment(Qt.AlignmentFlag.AlignTop)
- # screen.new_session.clicked.connect(self._show_welcome_view)
-
- def _show_welcome_view(self):
- clearLayout(self._control_panel_layout)
- screen = NewRecordingSession()
- self._control_panel_layout.addWidget(screen)
- # self._main_layout.setAlignment(Qt.AlignmentFlag.AlignTop)
- # screen.start_session_button.clicked.connect(self._show_cam_config_screen)
- screen.submit.clicked.connect(self._show_cam_config_screen)
-
- def _show_cam_config_screen(self):
- clearLayout(self._camera_view_panel_layout)
- screen = CameraConfiguration()
- self._camera_view_panel_layout.addWidget(screen)
- # self._main_layout.setAlignment(Qt.AlignmentFlag.AlignTop)
- # screen.config_accepted.clicked.connect(self._show_calibration_instructions_screen)
- if APP_STATE.use_previous_calibration_box_is_checked:
- screen.config_accepted.clicked.connect(self._show_record_videos_screen)
- else:
- screen.config_accepted.clicked.connect(self._show_calibration_screen)
-
- # def _show_calibration_instructions_screen(self):
- # clear_layout(self._main_layout)
- # screen = CalibrationInstructions()
- # self._main_layout.addWidget(screen)
- # self._main_layout.setAlignment(Qt.AlignmentFlag.AlignTop)
- # screen.continue_button.clicked.connect(self._show_calibration_screen)
-
- def _show_calibration_screen(self):
- clearLayout(self._main_layout)
- screen = ShowCamsCharuco()
- self._main_layout.addWidget(screen)
- self._main_layout.setAlignment(Qt.AlignmentFlag.AlignTop)
- self._main_layout.addWidget(self._jupyter_console_widget)
- screen.continue_button.clicked.connect(self._show_record_videos_screen)
-
- def _show_record_videos_screen(self):
- clearLayout(self._camera_view_panel_layout)
- self._jupyter_console_widget.print(
- f"Session started with id: {APP_STATE.session_id}"
- )
- screen = RecordVideos()
- self._camera_view_panel_layout.addWidget(screen)
-
- # self._main_layout.addWidget(self._jupyter_console_widget)
-
- # self._main_layout.setAlignment(Qt.AlignmentFlag.AlignTop)
diff --git a/src/gui/icis_conference_main/qt_utils/clear_layout.py b/src/gui/icis_conference_main/qt_utils/clear_layout.py
deleted file mode 100644
index f7c1ba70..00000000
--- a/src/gui/icis_conference_main/qt_utils/clear_layout.py
+++ /dev/null
@@ -1,5 +0,0 @@
-def clearLayout(layout):
- while layout.count():
- child = layout.takeAt(0)
- if child.widget():
- child.widget().deleteLater()
diff --git a/src/gui/icis_conference_main/qt_utils/set_font_size.py b/src/gui/icis_conference_main/qt_utils/set_font_size.py
deleted file mode 100644
index bcd5e4e9..00000000
--- a/src/gui/icis_conference_main/qt_utils/set_font_size.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from PyQt6.QtWidgets import QLabel
-
-
-def set_font_size(label_widget: QLabel, size: int):
- font = label_widget.font()
- font.setPointSize(size)
- label_widget.setFont(font)
diff --git a/src/gui/icis_conference_main/qt_widgets/jupyter_console_widget.py b/src/gui/icis_conference_main/qt_widgets/jupyter_console_widget.py
deleted file mode 100644
index a4b033ae..00000000
--- a/src/gui/icis_conference_main/qt_widgets/jupyter_console_widget.py
+++ /dev/null
@@ -1,107 +0,0 @@
-"""
-This example show how to create a Rich Jupyter Widget, and places it in a MainWindow alongside a PlotWidget.
-
-The widgets are implemented as `Docks` so they may be moved around within the Main Window
-
-The `__main__` function shows an example that inputs the commands to plot simple `sine` and cosine` waves, equivalent to creating such plots by entering the commands manually in the console
-
-Also shows the use of `whos`, which returns a list of the variables defined within the `ipython` kernel
-
-This method for creating a Jupyter console is based on the example(s) here:
-https://github.com/jupyter/qtconsole/tree/b4e08f763ef1334d3560d8dac1d7f9095859545a/examples
-especially-
-https://github.com/jupyter/qtconsole/blob/b4e08f763ef1334d3560d8dac1d7f9095859545a/examples/embed_qtconsole.py#L19
-
-"""
-
-
-import numpy as np
-import pyqtgraph as pg
-from pyqtgraph.Qt import QtWidgets
-from pyqtgraph.dockarea.Dock import Dock
-from pyqtgraph.dockarea.DockArea import DockArea
-
-try:
- from qtconsole import inprocess
-except:
- print(
- "The example in `jupyter_console_example.py` requires `qtconsole` to calculate_center_of_mass. Install with `pip install qtconsole` or equivalent."
- )
-
-
-class JupyterConsoleWidget(inprocess.QtInProcessRichJupyterWidget):
- def __init__(self, dark_mode: bool = True):
- super().__init__()
-
- self.kernel_manager = inprocess.QtInProcessKernelManager()
- self.kernel_manager.start_kernel()
- self.kernel_client = self.kernel_manager.client()
- self.kernel_client.start_channels()
- self._import_stuff()
- self.execute("%whos")
- if dark_mode:
- self.set_default_style("linux")
-
- def _import_stuff(self):
- self.execute("import numpy as np")
- self.execute("import matplotlib.pyplot as plt")
-
- def print(self, message: str):
- self.execute(f"print('{message}')")
-
- def shutdown_kernel(self):
- self.kernel_client.stop_channels()
- self.kernel_manager.shutdown_kernel()
-
-
-class MainWindow(QtWidgets.QMainWindow):
- def __init__(self, dark_mode=True):
- super().__init__()
- central_dock_area = DockArea()
-
- # create plot widget (and dock)
- self.plot_widget = pg.PlotWidget()
- plot_dock = Dock(name="Plot Widget Dock", closable=True)
- plot_dock.addWidget(self.plot_widget)
- central_dock_area.addDock(plot_dock)
-
- # create jupyter console widget (and dock)
- self.jupyter_console_widget = JupyterConsoleWidget()
- jupyter_console_dock = Dock("Jupyter Console Dock")
- jupyter_console_dock.addWidget(self.jupyter_console_widget)
- central_dock_area.addDock(jupyter_console_dock)
- self.setCentralWidget(central_dock_area)
-
- app = QtWidgets.QApplication.instance()
- app.aboutToQuit.connect(self.jupyter_console_widget.shutdown_kernel)
-
- kernel = self.jupyter_console_widget.kernel_manager.kernel
- kernel.shell.push_variables(dict(np=np, pw=self.plot_widget))
-
- # set dark mode
- if dark_mode:
- # Set Dark bg color via this relatively roundabout method
- self.jupyter_console_widget.set_default_style("linux")
-
-
-if __name__ == "__main__":
- pg.mkQApp()
- main = MainWindow(dark_mode=True)
- main.show()
- main.jupyter_console_widget.execute('print("hello world :D ")')
-
- # plot a sine/cosine waves by printing to console
- # this is equivalent to typing the commands into the console manually
- main.jupyter_console_widget.execute("x = np.arange(0, 3 * np.pi, .1)")
- main.jupyter_console_widget.execute("pw.plotItem.plot(np.sin(x), pen='r')")
- main.jupyter_console_widget.execute(
- "pw.plotItem.plot(np.cos(x),\
- pen='cyan',\
- symbol='o',\
- symbolPen='m',\
- symbolBrush=(0,0,255))"
- )
- main.jupyter_console_widget.execute("whos")
- main.jupyter_console_widget.execute("")
-
- pg.exec()
diff --git a/src/gui/icis_conference_main/shared_widgets/page_title.py b/src/gui/icis_conference_main/shared_widgets/page_title.py
deleted file mode 100644
index 93183b5e..00000000
--- a/src/gui/icis_conference_main/shared_widgets/page_title.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from PyQt6.QtCore import Qt
-from PyQt6.QtWidgets import QLabel
-
-from src.gui.icis_conference_main.qt_utils.set_font_size import set_font_size
-
-
-class PageTitle(QLabel):
- def __init__(self, *args, **kwargs):
- super().__init__(*args, **kwargs)
- set_font_size(self, 24)
- self.setAlignment(Qt.AlignmentFlag.AlignCenter)
- self.setStyleSheet("padding-bottom: 20px")
diff --git a/src/gui/icis_conference_main/shared_widgets/primary_button.py b/src/gui/icis_conference_main/shared_widgets/primary_button.py
deleted file mode 100644
index ad60b23f..00000000
--- a/src/gui/icis_conference_main/shared_widgets/primary_button.py
+++ /dev/null
@@ -1,38 +0,0 @@
-from PyQt6.QtWidgets import QPushButton
-
-
-active_primary_button_style_sheet = """
- QPushButton {
- background-color: #336e6d;
- color: #ffffff;
- border-radius: 4px;
- min-height: 32px;
- max-width: 160px;
- font-weight: 400;
- font-size: 16px;
- }
- QPushButton:hover {
- background-color: #365d5f;
- }
- """
-
-not_active_primary_button_style_sheet = """
- QPushButton {
- background-color: 'lightgrey';
- color: #ffffff;
- border-radius: 4px;
- min-height: 32px;
- max-width: 160px;
- font-weight: 400;
- font-size: 16px;
- }
- QPushButton:hover {
- background-color: 'lightgrey';
- }
- """
-
-
-class PrimaryButton(QPushButton):
- def __init__(self, *args, **kwargs):
- super().__init__(*args, **kwargs)
- self.setStyleSheet(active_primary_button_style_sheet)
diff --git a/src/gui/icis_conference_main/state/__init__.py b/src/gui/icis_conference_main/state/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/gui/icis_conference_main/state/app_state.py b/src/gui/icis_conference_main/state/app_state.py
deleted file mode 100644
index 2c057e94..00000000
--- a/src/gui/icis_conference_main/state/app_state.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from typing import List
-
-from pydantic import BaseModel
-
-
-class AppState(BaseModel):
- session_id: str = None
- selected_cameras: List[str] = []
- use_previous_calibration: bool = False
- number_of_frames_in_the_mocap_videos: int = None
-
-
-APP_STATE = AppState()
diff --git a/src/gui/icis_conference_main/workers/__init__.py b/src/gui/icis_conference_main/workers/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/gui/icis_conference_main/workers/cam_charuco_frame_worker.py b/src/gui/icis_conference_main/workers/cam_charuco_frame_worker.py
deleted file mode 100644
index edf4e60f..00000000
--- a/src/gui/icis_conference_main/workers/cam_charuco_frame_worker.py
+++ /dev/null
@@ -1,86 +0,0 @@
-import cv2
-from PyQt6.QtCore import QThread, Qt, pyqtSignal
-from PyQt6.QtGui import QImage
-
-from src.cameras.capture.opencv_camera.opencv_camera import OpenCVCamera
-from src.cameras.webcam_config import WebcamConfig
-from src.gui.icis_conference_main.state.app_state import APP_STATE
-from src.core_processes.capture_volume_calibration.charuco_board_detection.charuco_board_detector import (
- CharucoBoardDetector,
-)
-
-
-class CamCharucoFrameWorker(QThread):
- ImageUpdate = pyqtSignal(QImage)
-
- def __init__(
- self, cam_id=None, should_save_frames: bool = False, calibration_videos=False
- ):
- super().__init__()
- self._board_thingy = CharucoBoardDetector()
- self._cam_id = cam_id
- self._should_save_frames = should_save_frames
- self._should_continue = True
-
- @property
- def should_save_frames(self):
- return self._should_save_frames
-
- @should_save_frames.setter
- def should_save_frames(self, value):
- self._should_save_frames = value
-
- @property
- def video_recorder(self):
- return self._cam.video_recorder
-
- def run(self):
- cam = OpenCVCamera(
- WebcamConfig(webcam_id=self._cam_id),
- session_id=APP_STATE.session_id,
- )
- cam.connect()
- cam.start_frame_capture_thread()
-
- self._cam = cam
- any_frames_recorded = False
- try:
- while cam.is_capturing_frames:
- if not cam.new_frame_ready:
- continue
- payload = cam.latest_frame
-
- if self._should_save_frames:
- any_frames_recorded = True
- print("saving frame :D")
- cam.video_recorder.append_frame_payload_to_list(payload)
-
- charuco_payload = (
- self._board_thingy.detect_charuco_board_in_frame_payload(payload)
- )
- image_to_display = charuco_payload.annotated_image
- image_to_display = cv2.flip(image_to_display, 1)
- image_to_display = cv2.cvtColor(image_to_display, cv2.COLOR_BGR2RGB)
- converted_frame = QImage(
- image_to_display.data,
- image_to_display.shape[1],
- image_to_display.shape[0],
- QImage.Format.Format_RGB888,
- )
- converted_frame = converted_frame.scaled(
- 640, 480, Qt.AspectRatioMode.KeepAspectRatio
- )
- self.ImageUpdate.emit(converted_frame)
- finally:
- print(
- f"Closing the camera {self._cam.webcam_id_as_str}, and saving video to disk"
- )
- self._cam.close()
- # if any_frames_recorded:
- # print(f"saving video for camera {self._cam.webcam_id_as_str}")
- # self._cam.video_recorder.save_list_of_frames_to_video_file(calibration_videos=True)
- # print(f"Saved video to: {str(self._cam.video_recorder.path_to_save_video_file)}")
-
- def quit(self):
- self._cam.close()
- super().quit()
diff --git a/src/gui/icis_conference_main/workers/cam_detection_thread.py b/src/gui/icis_conference_main/workers/cam_detection_thread.py
deleted file mode 100644
index d749bcf1..00000000
--- a/src/gui/icis_conference_main/workers/cam_detection_thread.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from PyQt6.QtCore import QThread, pyqtSignal
-
-from src.cameras.detection.cam_singleton import get_or_create_cams
-from src.cameras.detection.models import FoundCamerasResponse
-
-
-class CamDetectionWorker(QThread):
- finished = pyqtSignal(FoundCamerasResponse)
-
- def run(self):
- cams = get_or_create_cams(always_create=True)
- self.finished.emit(cams)
diff --git a/src/gui/icis_conference_main/workers/cam_frame_worker.py b/src/gui/icis_conference_main/workers/cam_frame_worker.py
deleted file mode 100644
index d68cd42d..00000000
--- a/src/gui/icis_conference_main/workers/cam_frame_worker.py
+++ /dev/null
@@ -1,45 +0,0 @@
-import cv2
-from PyQt6.QtCore import QThread, Qt, pyqtSignal
-from PyQt6.QtGui import QImage
-
-from src.cameras.capture.opencv_camera.opencv_camera import OpenCVCamera
-from src.cameras.webcam_config import WebcamConfig
-
-
-class CamFrameWorker(QThread):
- ImageUpdate = pyqtSignal(QImage)
-
- def __init__(self, cam_id=None):
- super().__init__()
- self._cam_id = cam_id
-
- def run(self):
- cam = OpenCVCamera(WebcamConfig(webcam_id=self._cam_id))
- cam.connect()
- cam.start_frame_capture_thread()
- self._cam = cam
- try:
- while cam.is_capturing_frames:
- if not cam.new_frame_ready:
- continue
- payload = cam.latest_frame
-
- image = cv2.flip(payload.image, 1)
- image = cv2.cvtColor(image, cv2.COLOR_BGR2RGB)
- converted_frame = QImage(
- image.data,
- image.shape[1],
- image.shape[0],
- QImage.Format.Format_RGB888,
- )
- converted_frame = converted_frame.scaled(
- 640, 480, Qt.AspectRatioMode.KeepAspectRatio
- )
- self.ImageUpdate.emit(converted_frame)
- finally:
- print("Closing the camera")
- self._cam.close()
-
- def quit(self):
- self._cam.close()
- super().quit()
diff --git a/src/gui/icis_conference_main/workflows/available_camera.py b/src/gui/icis_conference_main/workflows/available_camera.py
deleted file mode 100644
index ce8ba19c..00000000
--- a/src/gui/icis_conference_main/workflows/available_camera.py
+++ /dev/null
@@ -1,49 +0,0 @@
-from PyQt6.QtWidgets import QCheckBox, QHBoxLayout, QLabel, QPushButton, QWidget
-
-
-class AvailableCamera(QWidget):
- def __init__(self, webcam_id: str = "0"):
- super().__init__()
- self._webcam_id = webcam_id
-
- name_layout = QHBoxLayout()
- name_layout.setSpacing(20)
- self._show_cam_checkbox = self._create_checkbox()
- name_layout.addWidget(self._create_checkbox())
- name_layout.addWidget(self._create_title())
- self._preview_button = self._create_preview_button()
- name_layout.addWidget(self._preview_button)
-
- self.setLayout(name_layout)
-
- @property
- def preview(self):
- return self._preview_button
-
- @property
- def webcam_id(self):
- return self._webcam_id
-
- @property
- def show_cam_checkbox(self):
- return self._show_cam_checkbox
-
- def _create_title(self):
- camera_title = QLabel(f"Camera {self._webcam_id}")
- return camera_title
-
- def _create_checkbox(self):
- show_hide_checkbox = QCheckBox()
- show_hide_checkbox.setChecked(True)
- show_hide_checkbox.stateChanged.connect(self._state_changed)
- return show_hide_checkbox
-
- def _create_preview_button(self):
- preview = QPushButton("Preview")
- return preview
-
- def _state_changed(self, state):
- if self._show_cam_checkbox.isChecked() == bool(state):
- return
- self._show_cam_checkbox.setChecked(state)
- checked = self._show_cam_checkbox.isChecked()
diff --git a/src/gui/icis_conference_main/workflows/available_cameras_list.py b/src/gui/icis_conference_main/workflows/available_cameras_list.py
deleted file mode 100644
index 378f3eda..00000000
--- a/src/gui/icis_conference_main/workflows/available_cameras_list.py
+++ /dev/null
@@ -1,95 +0,0 @@
-from functools import partial
-
-from PyQt6.QtCore import Qt, pyqtSignal
-from PyQt6.QtWidgets import QHBoxLayout, QLabel, QPushButton, QVBoxLayout, QWidget
-
-from src.cameras.detection.models import FoundCamerasResponse
-from src.gui.icis_conference_main.qt_utils.clear_layout import clearLayout
-from src.gui.icis_conference_main.workers.cam_detection_thread import CamDetectionWorker
-from src.gui.icis_conference_main.workflows.available_camera import AvailableCamera
-
-
-class AvailableCamerasList(QWidget):
- PreviewClicked = pyqtSignal(str)
-
- def __init__(self):
- super().__init__()
- self._worker = CamDetectionWorker()
- self._worker.finished.connect(self._clear_and_add_widgets)
-
- container = QVBoxLayout()
-
- title_layout = QHBoxLayout()
- avail_cam_title = QLabel("Available Cameras")
- self._detect_button = self._create_refresh_button()
-
- title_layout.addWidget(avail_cam_title)
- title_layout.addWidget(self._detect_button)
- title_layout.setAlignment(Qt.AlignmentFlag.AlignLeft)
-
- self._camera_list_layout = QVBoxLayout()
- self._camera_list_layout.setAlignment(Qt.AlignmentFlag.AlignLeft)
-
- container.addLayout(title_layout)
- container.addLayout(self._camera_list_layout)
-
- self.setLayout(container)
-
- self._enable_accept_button_callback = None
-
- # automatically detect cameras on page load
- self._detect()
-
- @property
- def enable_accept_button_callback(self):
- return self._enable_accept_button_callback
-
- @enable_accept_button_callback.setter
- def enable_accept_button_callback(self, callback):
- self._enable_accept_button_callback = callback
-
- @property
- def get_checked_cameras(self):
- selected_cameras = []
- for cam_widget in self._current_cam_widgets:
- if cam_widget.show_cam_checkbox.isChecked():
- selected_cameras.append(cam_widget.webcam_id)
- return selected_cameras
-
- @property
- def detect_button(self):
- return self._detect_button
-
- def _create_refresh_button(self):
- refresh_button = QPushButton("Re-detect")
- refresh_button.clicked.connect(self._detect)
- return refresh_button
-
- def _detect(self):
- if self._worker.isRunning():
- return
- self._worker.start()
-
- def _create_available_camera_widgets(self, detected: FoundCamerasResponse):
- camera_widgets = []
- for cam in detected.cameras_found_list:
- available_cam = AvailableCamera(cam.webcam_id)
- available_cam.preview.clicked.connect(
- partial(self._handle_camera_preview_click, cam.webcam_id)
- )
- camera_widgets.append(available_cam)
-
- self._enable_accept_button_callback()
-
- return camera_widgets
-
- def _clear_and_add_widgets(self, detected: FoundCamerasResponse):
- clearLayout(self._camera_list_layout)
- current_cam_widgets = self._create_available_camera_widgets(detected)
- for widget in current_cam_widgets:
- self._camera_list_layout.addWidget(widget)
-
- self._current_cam_widgets = current_cam_widgets
-
- def _handle_camera_preview_click(self, cam_id):
- self.PreviewClicked.emit(cam_id)
diff --git a/src/gui/icis_conference_main/workflows/calibration_instructions.py b/src/gui/icis_conference_main/workflows/calibration_instructions.py
deleted file mode 100644
index c47b2933..00000000
--- a/src/gui/icis_conference_main/workflows/calibration_instructions.py
+++ /dev/null
@@ -1,44 +0,0 @@
-from PyQt6.QtWidgets import QHBoxLayout, QLabel, QVBoxLayout, QWidget
-
-from src.gui.icis_conference_main.shared_widgets.page_title import PageTitle
-from src.gui.icis_conference_main.shared_widgets.primary_button import PrimaryButton
-
-
-class CalibrationInstructions(QWidget):
- def __init__(self):
- super().__init__()
- self._continue_button = PrimaryButton("Continue")
-
- container = QVBoxLayout()
- container.addLayout(self._create_title_layout())
- container.addLayout(self._create_description_layout())
- container.addLayout(self._create_continue_button_container())
-
- self.setLayout(container)
-
- @property
- def continue_button(self):
- return self._continue_button
-
- def _create_title_layout(self):
- instructions_title_layout = QVBoxLayout()
- instructions_title = PageTitle("Multi-Camera Calibration")
- instructions_title_layout.addWidget(instructions_title)
- return instructions_title_layout
-
- def _create_description_layout(self):
- description_layout = QVBoxLayout()
- description_1 = QLabel(
- "Hold up the Charuko boards so all cameras can see every square. Don't have one? Get one here "
- )
- description_2 = QLabel(
- "Note: You may need to adjust the cameras if you are having an issue"
- )
- description_layout.addWidget(description_1)
- description_layout.addWidget(description_2)
- return description_layout
-
- def _create_continue_button_container(self):
- continue_button_layout = QHBoxLayout()
- continue_button_layout.addWidget(self._continue_button)
- return continue_button_layout
diff --git a/src/gui/icis_conference_main/workflows/camera_configuration.py b/src/gui/icis_conference_main/workflows/camera_configuration.py
deleted file mode 100644
index b1cc4198..00000000
--- a/src/gui/icis_conference_main/workflows/camera_configuration.py
+++ /dev/null
@@ -1,96 +0,0 @@
-import time
-
-from PyQt6.QtGui import QPixmap
-from PyQt6.QtWidgets import QHBoxLayout, QLabel, QPushButton, QVBoxLayout, QWidget
-
-from src.gui.icis_conference_main.shared_widgets.page_title import PageTitle
-from src.gui.icis_conference_main.shared_widgets.primary_button import (
- PrimaryButton,
- not_active_primary_button_style_sheet,
- active_primary_button_style_sheet,
-)
-from src.gui.icis_conference_main.state.app_state import APP_STATE
-from src.gui.icis_conference_main.workers.cam_frame_worker import CamFrameWorker
-from src.gui.icis_conference_main.workflows.available_cameras_list import (
- AvailableCamerasList,
-)
-
-
-class CameraConfiguration(QWidget):
- def __init__(self):
- super().__init__()
- self._worker = self._init_frame_worker()
- self._accept_button = self._create_accept_button()
-
- container = QVBoxLayout()
-
- # Holds the Camera Configuration Title
- config_title_layout = QHBoxLayout()
- cam_cfg_title = PageTitle("Camera Configuration")
- config_title_layout.addWidget(cam_cfg_title)
-
- # Shows the cameras that can be selected, and shows previews(TODO)
- camera_and_preview_container = QHBoxLayout()
- self._list_widget = self._create_available_cams_widget()
- self._video = self._create_preview_image()
- camera_and_preview_container.addWidget(self._list_widget)
- camera_and_preview_container.addWidget(self._video)
-
- # Holds the Accept Button
- self._accept_container = QHBoxLayout()
- self._accept_container.addWidget(self._accept_button)
-
- container.addLayout(config_title_layout)
- container.addLayout(camera_and_preview_container)
- container.addLayout(self._accept_container)
-
- self.setLayout(container)
-
- @property
- def config_accepted(self):
- return self._accept_button
-
- def _init_frame_worker(self):
- worker = CamFrameWorker()
- worker.ImageUpdate.connect(self._handle_image_update)
-
- return worker
-
- def _create_accept_button(self):
- accept_button = PrimaryButton("Accept")
- accept_button.clicked.connect(self._handle_accept_button_click)
- accept_button.setEnabled(False)
- accept_button.setStyleSheet(not_active_primary_button_style_sheet)
- return accept_button
-
- def _enable_accept_button(self):
- self._accept_button.setEnabled(True)
- self._accept_button.setStyleSheet(active_primary_button_style_sheet)
-
- def _create_available_cams_widget(self):
- list_widget = AvailableCamerasList()
- list_widget.enable_accept_button_callback = self._enable_accept_button
- list_widget.PreviewClicked.connect(self._create_preview_worker)
- return list_widget
-
- def _create_preview_image(self):
- video_preview = QLabel()
- return video_preview
-
- def _create_preview_worker(self, cam_id):
- self._video.clear()
- if self._worker.isRunning():
- self._worker.quit()
- while not self._worker.isFinished():
- time.sleep(0.1)
-
- self._worker._cam_id = cam_id
- self._worker.start()
-
- def _handle_image_update(self, image):
- self._video.setPixmap(QPixmap.fromImage(image))
-
- def _handle_accept_button_click(self):
- # Save the selected cameras to app state
- selected_cams = self._list_widget.get_checked_cameras
- APP_STATE.selected_cameras = selected_cams
diff --git a/src/gui/icis_conference_main/workflows/new_recording_session.py b/src/gui/icis_conference_main/workflows/new_recording_session.py
deleted file mode 100644
index b78ccf04..00000000
--- a/src/gui/icis_conference_main/workflows/new_recording_session.py
+++ /dev/null
@@ -1,77 +0,0 @@
-from PyQt6.QtWidgets import (
- QHBoxLayout,
- QLabel,
- QLineEdit,
- QPushButton,
- QVBoxLayout,
- QWidget,
- QCheckBox,
-)
-
-from src.config.home_dir import create_default_session_id
-from src.gui.icis_conference_main.shared_widgets.page_title import PageTitle
-from src.gui.icis_conference_main.shared_widgets.primary_button import PrimaryButton
-from src.gui.icis_conference_main.state.app_state import APP_STATE
-
-
-class NewRecordingSession(QWidget):
- def __init__(self):
- super().__init__()
-
- self._submit_button = PrimaryButton("&Start Session")
- self._use_previous_calibration_checkbox = (
- self._create_use_previous_calibration_checkbox()
- )
-
- container = QVBoxLayout()
-
- session_title = self._create_record_sesion_title()
- container.addWidget(session_title)
-
- session_id_text_layout = QHBoxLayout()
- session_id_text_layout.addWidget(QLabel("Session Id"))
- self._session_input = self._create_session_input()
- session_id_text_layout.addWidget(self._create_session_input())
-
- container.addLayout(session_id_text_layout)
- container.addWidget(self._use_previous_calibration_checkbox)
- container.addLayout(self._create_submit_button_layout())
-
- self.setLayout(container)
-
- @property
- def submit(self):
- return self._submit_button
-
- def _create_use_previous_calibration_checkbox(self):
- previous_calibration_checkbox = QCheckBox("Use Previous Calibration")
- previous_calibration_checkbox.setChecked(False)
- previous_calibration_checkbox.stateChanged.connect(
- self._use_previous_calibration_changed
- )
- return previous_calibration_checkbox
-
- def _create_record_sesion_title(self):
- session_title = PageTitle(
- "welcome \n to \n freemocap! \n \U00002728 \U0001F480 \U00002728 "
- )
- return session_title
-
- def _create_session_input(self):
- session_text_input = QLineEdit()
- session_text_input.setText(create_default_session_id())
- return session_text_input
-
- def _create_submit_button_layout(self):
- submit_button_layout = QHBoxLayout()
- self._submit_button.clicked.connect(self._assign_session_id_to_state)
- submit_button_layout.addWidget(self._submit_button)
- return submit_button_layout
-
- def _assign_session_id_to_state(self):
- APP_STATE.session_id = self._session_input.text()
-
- def _use_previous_calibration_changed(self):
- APP_STATE.use_previous_calibration_box_is_checked = (
- self._use_previous_calibration_checkbox.isChecked()
- )
diff --git a/src/gui/icis_conference_main/workflows/record_instructions.py b/src/gui/icis_conference_main/workflows/record_instructions.py
deleted file mode 100644
index 9344a740..00000000
--- a/src/gui/icis_conference_main/workflows/record_instructions.py
+++ /dev/null
@@ -1,39 +0,0 @@
-from PyQt6.QtWidgets import QHBoxLayout, QLabel, QVBoxLayout, QWidget
-
-from src.gui.icis_conference_main.shared_widgets.primary_button import PrimaryButton
-
-
-class RecordInstructions(QWidget):
- def __init__(self):
- super().__init__()
- self._record_button = PrimaryButton("Record")
-
- container = QVBoxLayout()
- container.addLayout(self._create_title_layout())
- container.addLayout(self._create_description_layout())
- container.addLayout(self._create_record_button_container())
-
- self.setLayout(container)
-
- @property
- def record(self):
- return self._record_button
-
- def _create_title_layout(self):
- instructions_title_layout = QVBoxLayout()
- instructions_title = QLabel("Start Recording")
- instructions_title_layout.addWidget(instructions_title)
- return instructions_title_layout
-
- def _create_description_layout(self):
- description_layout = QVBoxLayout()
- description_1 = QLabel(
- "Cameras are configured & calibrated. Hit the record button when you're ready! "
- )
- description_layout.addWidget(description_1)
- return description_layout
-
- def _create_record_button_container(self):
- continue_button_layout = QHBoxLayout()
- continue_button_layout.addWidget(self._record_button)
- return continue_button_layout
diff --git a/src/gui/icis_conference_main/workflows/record_videos.py b/src/gui/icis_conference_main/workflows/record_videos.py
deleted file mode 100644
index 97e44096..00000000
--- a/src/gui/icis_conference_main/workflows/record_videos.py
+++ /dev/null
@@ -1,191 +0,0 @@
-from PyQt6.QtWidgets import (
- QCheckBox,
- QHBoxLayout,
- QLabel,
- QPushButton,
- QVBoxLayout,
- QWidget,
-)
-
-from src.cameras.save_synchronized_videos import save_synchronized_videos
-from src.core_processes.mediapipe_stuff.mediapipe_skeleton_detector import (
- MediaPipeSkeletonDetector,
-)
-from src.gui.icis_conference_main.state.app_state import APP_STATE
-from src.gui.icis_conference_main.workflows.single_camera import SingleCamera
-from src.blender_stuff import (
- export_to_blender,
-)
-from src.pipelines.calibration_pipeline.calibration_pipeline_orchestrator import (
- CalibrationPipelineOrchestrator,
-)
-from src.pipelines.session_pipeline.session_pipeline_orchestrator import (
- SessionPipelineOrchestrator,
- load_mediapipe2d_data,
-)
-
-
-class RecordVideos(QWidget):
- def __init__(self):
- super().__init__()
- # TODO: Take it in from init
- self._selected_cams = APP_STATE.selected_cameras
-
- container = QVBoxLayout()
-
- title_layout = QHBoxLayout()
- title = QLabel("Record Session Videos")
- title_layout.addWidget(title)
-
- video_stream_layout = QHBoxLayout()
- self._cam_widgets = []
- for cam_id in self._selected_cams:
- single_cam = SingleCamera(cam_id)
- single_cam.capture()
- video_stream_layout.addWidget(single_cam)
- self._cam_widgets.append(single_cam)
-
- container.addLayout(title_layout)
- container.addLayout(video_stream_layout)
-
- # start/stop recording button layout
- record_button_layout = QHBoxLayout()
- self._start_recording_button = QPushButton("Begin Recording")
- self._stop_recording_button = QPushButton("Stop Recording")
- self._stop_recording_button.setEnabled(False)
-
- self._start_recording_button.clicked.connect(self._start_recording_frames)
- self._stop_recording_button.clicked.connect(self._stop_recording_frames)
-
- record_button_layout.addWidget(self._start_recording_button)
- record_button_layout.addWidget(self._stop_recording_button)
- container.addLayout(record_button_layout)
-
- # post-recording buttons
- post_recording_button_layout = QHBoxLayout()
-
- self._detect_2d_skeletons_button = QPushButton("Detect 2d Skeletons in Videos")
- self._reconstruct_3d_skeletons_button = QPushButton("Reconstruct 3d Skeletons")
- self._visualize_freemocap_session_button = QPushButton(
- "Visualize Freemocap Session"
- )
- self._open_in_blender_button = QPushButton("Open Session in Blender")
-
- self._detect_2d_skeletons_button.setEnabled(False)
- self._reconstruct_3d_skeletons_button.setEnabled(False)
- self._visualize_freemocap_session_button.setEnabled(False)
-
- self._detect_2d_skeletons_button.clicked.connect(self._detect_2d_skeletons)
- self._reconstruct_3d_skeletons_button.clicked.connect(
- self._reconstruct_3d_skeletons
- )
- self._visualize_freemocap_session_button.clicked.connect(
- self._visualize_freemocap_session
- )
- self._open_in_blender_button.clicked.connect(
- self._create_blender_scene_from_session_data
- )
-
- self._process_automatically_checkbox = QCheckBox("Process Videos Automatically")
- self._process_automatically_checkbox.setChecked(True)
-
- container.addWidget(self._process_automatically_checkbox)
-
- post_recording_button_layout.addWidget(self._process_automatically_checkbox)
- post_recording_button_layout.addWidget(self._detect_2d_skeletons_button)
- post_recording_button_layout.addWidget(self._reconstruct_3d_skeletons_button)
- post_recording_button_layout.addWidget(self._visualize_freemocap_session_button)
- post_recording_button_layout.addWidget(self._open_in_blender_button)
-
- container.addLayout(post_recording_button_layout)
-
- self.setLayout(container)
-
- def _activate_button(self, button):
- button.setEnabled(True)
- button.setStyleSheet("background-color : #d95157")
-
- def _deactivate_button(self, button):
- button.setEnabled(False)
- button.setStyleSheet("background-color : #a4d6d9")
-
- def _start_recording_frames(self):
- self._start_recording_button.setEnabled(False)
- self._stop_recording_button.setEnabled(True)
-
- for cam in self._cam_widgets:
- cam.should_record_frames = True
-
- def _stop_recording_frames(self):
- self._stop_recording_button.setEnabled(False)
- self._detect_2d_skeletons_button.setEnabled(True)
-
- video_recorders = []
- for cam in self._cam_widgets:
- video_recorders.append(cam.video_recorder)
- cam.quit()
- save_synchronized_videos(video_recorders, mocap_videos=True)
-
- if self._process_automatically_checkbox.isChecked():
- self._detect_2d_skeletons()
-
- def _detect_2d_skeletons(self):
- print(
- f"tracking 2D mediapipe skeletons in videos from session: {APP_STATE.session_id}"
- )
- mediapipe_skeleton_detector = MediaPipeSkeletonDetector(APP_STATE.session_id)
- mediapipe_skeleton_detector.process_session_folder()
-
- self._detect_2d_skeletons_button.setEnabled(False)
- self._reconstruct_3d_skeletons_button.setEnabled(True)
-
- if self._process_automatically_checkbox.isChecked():
- self._reconstruct_3d_skeletons()
-
- def _reconstruct_3d_skeletons(self):
- print(f"Reconstruct 3D Skeletons : {APP_STATE.session_id}")
- session_orchestrator = SessionPipelineOrchestrator(
- session_id=APP_STATE.session_id
- )
-
- if APP_STATE.use_previous_calibration_box_is_checked:
- session_orchestrator.anipose_camera_calibration_object = (
- CalibrationPipelineOrchestrator().load_most_recent_calibration()
- )
- else:
- session_orchestrator.anipose_camera_calibration_object = (
- CalibrationPipelineOrchestrator().load_calibration_from_session_id(
- APP_STATE.session_id
- )
- )
-
- session_orchestrator.mediapipe2d_numCams_numFrames_numTrackedPoints_XY = (
- load_mediapipe2d_data(APP_STATE.session_id)
- )
- session_orchestrator.reconstruct3d_from_2d_data_offline()
-
- self._reconstruct_3d_skeletons_button.setEnabled(False)
- self._open_in_blender_button.setEnabled(True)
-
- if self._process_automatically_checkbox.isChecked():
- self._create_blender_scene_from_session_data()
-
- def _visualize_freemocap_session(self):
- pass
- # mediapipe3d_data_payload = load_mediapipe3d_skeleton_data(APP_STATE.session_id)
- #
- # mediapipe3d_skeleton_nFrames_nTrajectories_xyz =
- # mediapipe3d_data_payload.data3d_numFrames_numTrackedPoints_XYZ
- # mediapipe3d_skeleton_nFrames_nTrajectories_reprojectionError =
- # mediapipe3d_data_payload.data3d_numFrames_numTrackedPoint_reprojectionError
- #
- # visualize_skeleton_dialog = VisualizeSkeleton(
- # mediapipe_skel_fr_mar_xyz=mediapipe3d_skeleton_nFrames_nTrajectories_xyz)
- #
- # get_qt_app().quit()
- # visualize_skeleton_dialog.exec()
- # visualize_skeleton_dialog.start_animation()
-
- def _create_blender_scene_from_session_data(self):
- print(f"Open in Blender : {APP_STATE.session_id}")
- export_to_blender(APP_STATE.session_id)
diff --git a/src/gui/icis_conference_main/workflows/show_cams_charuco.py b/src/gui/icis_conference_main/workflows/show_cams_charuco.py
deleted file mode 100644
index 25c3390e..00000000
--- a/src/gui/icis_conference_main/workflows/show_cams_charuco.py
+++ /dev/null
@@ -1,121 +0,0 @@
-from PyQt6.QtWidgets import (
- QHBoxLayout,
- QLabel,
- QVBoxLayout,
- QWidget,
- QPushButton,
- QCheckBox,
-)
-
-from src.cameras.save_synchronized_videos import save_synchronized_videos
-from src.gui.icis_conference_main.state.app_state import APP_STATE
-from src.gui.icis_conference_main.workflows.single_camera import SingleCamera
-
-from src.pipelines.calibration_pipeline.calibration_pipeline_orchestrator import (
- CalibrationPipelineOrchestrator,
-)
-
-
-class ShowCamsCharuco(QWidget):
- def __init__(self):
- super().__init__()
- # TODO: Take it in from init
- self._selected_cams = APP_STATE.selected_cameras
-
- self._continue_button = QPushButton("Continue")
- self._continue_button.setEnabled(False)
-
- self._use_previous_calibration_checkbox = (
- self._create_use_previous_calibration_checkbox()
- )
-
- container = QVBoxLayout()
-
- title_layout = QHBoxLayout()
- title = QLabel("Multi-Camera Calibration")
- title_layout.addWidget(title)
-
- video_stream_layout = QHBoxLayout()
- self._cam_widgets = []
- for cam_id in self._selected_cams:
- single_cam = SingleCamera(cam_id)
- single_cam.capture()
- video_stream_layout.addWidget(single_cam)
- self._cam_widgets.append(single_cam)
-
- container.addLayout(title_layout)
- container.addLayout(video_stream_layout)
-
- container.addWidget(self._use_previous_calibration_checkbox)
-
- # start/stop recording button layout
- record_button_layout = QHBoxLayout()
- self._start_recording_button = QPushButton("Begin Recording")
- self._stop_recording_button = QPushButton("Stop Recording")
- self._stop_recording_button.setEnabled(False)
-
- self._start_recording_button.clicked.connect(self._start_recording_frames)
- self._stop_recording_button.clicked.connect(self._stop_recording_frames)
-
- record_button_layout.addWidget(self._start_recording_button)
- record_button_layout.addWidget(self._stop_recording_button)
- container.addLayout(record_button_layout)
-
- container.addLayout(self._create_continue_button_container())
- container.addWidget(self._use_previous_calibration_checkbox)
-
- self.setLayout(container)
-
- @property
- def continue_button(self):
- return self._continue_button
-
- def _create_use_previous_calibration_checkbox(self):
- previous_calibration_checkbox = QCheckBox("Use Previous Calibration")
- previous_calibration_checkbox.setChecked(False)
- previous_calibration_checkbox.stateChanged.connect(
- self._use_previous_calibration_changed
- )
- return previous_calibration_checkbox
-
- def _create_continue_button_container(self):
- continue_button_layout = QHBoxLayout()
- continue_button_layout.addWidget(self._continue_button)
- return continue_button_layout
-
- def _use_previous_calibration_changed(self):
- self._continue_button.setEnabled(
- self._use_previous_calibration_checkbox.isChecked()
- )
- APP_STATE.use_previous_calibration_box_is_checked = (
- self._use_previous_calibration_checkbox.isChecked()
- )
-
- def _start_recording_frames(self):
- self._start_recording_button.setEnabled(False)
- self._stop_recording_button.setEnabled(True)
- for cam in self._cam_widgets:
- cam.should_record_frames = True
-
- def _stop_recording_frames(self):
- self._stop_recording_button.setEnabled(False)
- video_recorders = []
- for cam in self._cam_widgets:
- video_recorders.append(cam.video_recorder)
- cam.quit()
-
- save_synchronized_videos(video_recorders, calibration_videos=True)
- self._run_anipose_calibration()
- print("Multi-camera calibration complete!")
- self._continue_button.setEnabled(True)
-
- def _run_anipose_calibration(self):
- print("Beginning Anipose calibration")
- calibration_orchestrator = CalibrationPipelineOrchestrator(APP_STATE.session_id)
- try:
- calibration_orchestrator.run_anipose_camera_calibration(
- charuco_square_size=39, pin_camera_0_to_origin=True
- )
- except:
- print("something failed in the anipose calibration")
- raise Exception
diff --git a/src/gui/icis_conference_main/workflows/single_camera.py b/src/gui/icis_conference_main/workflows/single_camera.py
deleted file mode 100644
index 624c2095..00000000
--- a/src/gui/icis_conference_main/workflows/single_camera.py
+++ /dev/null
@@ -1,75 +0,0 @@
-import enum
-
-from PyQt6.QtCore import pyqtSignal
-from PyQt6.QtGui import QPixmap
-from PyQt6.QtWidgets import QHBoxLayout, QLabel, QWidget
-
-from src.gui.icis_conference_main.workers.cam_charuco_frame_worker import (
- CamCharucoFrameWorker,
-)
-from src.gui.icis_conference_main.workers.cam_frame_worker import CamFrameWorker
-
-
-class WorkerType(enum.Enum):
- FRAME_CAPTURE = 0
- CHARUCO = 1
-
-
-def construct_worker(worker_type: WorkerType):
- if worker_type.CHARUCO:
- return CamCharucoFrameWorker
-
- if worker_type.FRAME_CAPTURE:
- return CamFrameWorker
-
- raise Exception("What?")
-
-
-class SingleCamera(QWidget):
- started = pyqtSignal()
-
- def __init__(self, cam_id):
- super().__init__()
- self._cam_id = cam_id
- self._worker = self._init_frame_worker()
- self._video = QLabel()
-
- layout = QHBoxLayout()
- layout.addWidget(self._video)
-
- self.setLayout(layout)
-
- @property
- def should_record_frames(self):
- return self._worker.should_save_frames
-
- @should_record_frames.setter
- def should_record_frames(self, value):
- self._worker.should_save_frames = value
-
- @property
- def video_recorder(self):
- return self._worker.video_recorder
-
- def capture(self):
- self._create_preview_worker()
- self.started.emit()
-
- def quit(self):
- self._worker.quit()
-
- def _init_frame_worker(self):
- worker = construct_worker(WorkerType.CHARUCO)(self._cam_id)
- worker.ImageUpdate.connect(self._handle_image_update)
- return worker
-
- def _create_preview_worker(self):
- # self._video.clear()
- # if self._worker.isRunning():
- # self._worker.quit()
- # while not self._worker.isFinished():
- # time.sleep(.1)
- self._worker.start()
-
- def _handle_image_update(self, image):
- self._video.setPixmap(QPixmap.fromImage(image))
diff --git a/src/gui/icis_conference_main/workflows/visualize_session.py b/src/gui/icis_conference_main/workflows/visualize_session.py
deleted file mode 100644
index bd162811..00000000
--- a/src/gui/icis_conference_main/workflows/visualize_session.py
+++ /dev/null
@@ -1,170 +0,0 @@
-# adapted from - https://gist.github.com/markjay4k/da2f55e28514be7160a7c5fbf95bd243
-import logging
-from pathlib import Path
-from typing import Union, List
-
-from PyQt6.QtWidgets import QDialog, QVBoxLayout
-from pyqtgraph.Qt import QtCore, QtGui
-import pyqtgraph.opengl as gl
-import pyqtgraph as pg
-import numpy as np
-import sys
-from mediapipe.python.solutions import holistic as mp_holistic
-
-from src.gui.refactored_gui.state.app_state import APP_STATE
-
-logger = logging.getLogger(__name__)
-
-
-class VisualizeSkeleton(QDialog):
- def __init__(
- self,
- mediapipe_skel_fr_mar_xyz: np.ndarray,
- start_frame: int = None,
- end_frame: int = None,
- move_data_to_origin: bool = True,
- ):
- super().__init__()
-
- self.mediapipe_fr_mar_xyz = mediapipe_skel_fr_mar_xyz
-
- if move_data_to_origin:
- self.move_data_to_origin()
-
- if start_frame is None:
- self.start_frame_number = 0
- else:
- self.start_frame_number = start_frame
- if end_frame is None:
- self.end_frame_number = self.mediapipe_fr_mar_xyz.shape[0]
- else:
- self.end_frame_number = end_frame
-
- self.current_frame_number = self.start_frame_number
-
- self.gl_view_widget = self.initialize_display_window()
-
- self.setWindowTitle(f"FreeMoCap Session: {APP_STATE.session_id}")
-
- self.layout = QVBoxLayout()
- self.layout.addWidget(self.gl_view_widget)
-
- self.setLayout(self.layout)
-
- def initialize_display_window(self):
- self.create_app_window()
- self.create_grid_planes()
- self.get_mediapipe_connections()
- self.initialize_skel_dottos()
- self.initialize_skel_lines()
- return self.gl_view_widget
-
- def create_app_window(self):
- self.gl_view_widget = gl.GLViewWidget()
- self.gl_view_widget.opts["distance"] = 2000
- # self.gl_view_widget.setWindowTitle('FreeMoCap Skeleton')
- self.gl_view_widget.setGeometry(0, 110, 1920, 1080)
- # self.gl_view_widget.show()
-
- def create_grid_planes(self):
- grid_scale = 2e3
- # create the background grids
- grid_plane_x = gl.GLGridItem()
- grid_plane_x.setSize(grid_scale, grid_scale, grid_scale)
- grid_plane_x.setSpacing(grid_scale / 10, grid_scale / 10, grid_scale / 10)
- grid_plane_x.rotate(90, 0, 1, 0)
- grid_plane_x.translate(-grid_scale, 0, 0)
- self.gl_view_widget.addItem(grid_plane_x)
-
- grid_plane_y = gl.GLGridItem()
- grid_plane_y.setSize(grid_scale, grid_scale, grid_scale)
- grid_plane_y.setSpacing(grid_scale / 10, grid_scale / 10, grid_scale / 10)
- grid_plane_y.rotate(90, 1, 0, 0)
- grid_plane_y.translate(0, -grid_scale, 0)
- self.gl_view_widget.addItem(grid_plane_y)
-
- grid_plane_z = gl.GLGridItem()
- grid_plane_z.setSize(grid_scale, grid_scale, grid_scale)
- grid_plane_z.setSpacing(grid_scale / 10, grid_scale / 10, grid_scale / 10)
- grid_plane_z.translate(0, 0, -grid_scale)
- self.gl_view_widget.addItem(grid_plane_z)
-
- def get_mediapipe_connections(self):
- self.mediapipe_body_connections = [
- this_connection for this_connection in mp_holistic.POSE_CONNECTIONS
- ]
- self.mediapipe_hand_connections = [
- this_connection for this_connection in mp_holistic.HAND_CONNECTIONS
- ]
- self.mediapipe_face_connections = [
- this_connection for this_connection in mp_holistic.FACEMESH_TESSELATION
- ]
-
- def initialize_skel_dottos(self):
- self.skeleton_scatter_item = gl.GLScatterPlotItem(
- pos=self.mediapipe_fr_mar_xyz[self.current_frame_number, :, :],
- color=(0, 1, 1, 1),
- size=10,
- pxMode=False,
- )
- self.gl_view_widget.addItem(self.skeleton_scatter_item)
-
- def initialize_skel_lines(self):
- self.skeleton_connections_list = []
- for this_connection in self.mediapipe_body_connections:
- this_skel_line = gl.GLLinePlotItem(
- pos=self.mediapipe_fr_mar_xyz[
- self.current_frame_number, this_connection, :
- ]
- )
- self.skeleton_connections_list.append(this_skel_line)
- self.gl_view_widget.addItem(this_skel_line)
-
- def update(self):
- self.update_frame_number()
- if self.current_frame_number % 10 == 0:
- print(f"frame number: {self.current_frame_number}")
-
- self.update_skeleton()
-
- def update_skeleton(self):
- # skel dottos
- self.skeleton_scatter_item.setData(
- pos=self.mediapipe_fr_mar_xyz[self.current_frame_number, :, :]
- )
-
- # skel lines
- for this_skeleton_line_number, this_connection in enumerate(
- self.mediapipe_body_connections
- ):
- self.skeleton_connections_list[this_skeleton_line_number].setData(
- pos=self.mediapipe_fr_mar_xyz[
- self.current_frame_number, this_connection, :
- ]
- )
-
- def update_frame_number(self):
- self.current_frame_number += 1
- if self.current_frame_number >= self.end_frame_number:
- self.current_frame_number = self.start_frame_number
-
- def start(self):
- print("starting animation")
- pg.exec()
-
- def start_animation(self):
- print("initializing display window")
- self.initialize_display_window()
- timer = QtCore.QTimer()
- timer.timeout.connect(self.update)
- timer.start(33)
- # self.start()
-
- def move_data_to_origin(self):
- mean_position_xyz = np.nanmedian(
- np.nanmedian(self.mediapipe_fr_mar_xyz, axis=0), axis=0
- )
-
- self.mediapipe_fr_mar_xyz[:, :, 0] -= mean_position_xyz[0]
- self.mediapipe_fr_mar_xyz[:, :, 1] -= mean_position_xyz[1]
- self.mediapipe_fr_mar_xyz[:, :, 2] -= mean_position_xyz[2]
diff --git a/src/gui/icis_conference_main/workflows/welcome.py b/src/gui/icis_conference_main/workflows/welcome.py
deleted file mode 100644
index 3958655f..00000000
--- a/src/gui/icis_conference_main/workflows/welcome.py
+++ /dev/null
@@ -1,55 +0,0 @@
-from PyQt6.QtCore import Qt
-from PyQt6.QtWidgets import (
- QHBoxLayout,
- QLabel,
- QVBoxLayout,
- QWidget,
- QGridLayout,
- QSpacerItem,
- QCheckBox,
-)
-
-from src.gui.icis_conference_main.qt_utils.set_font_size import set_font_size
-from src.gui.icis_conference_main.shared_widgets.primary_button import PrimaryButton
-
-
-class Welcome(QWidget):
- def __init__(self):
- super().__init__()
-
- self._new_session_button = PrimaryButton("Start New Session")
-
- container = QVBoxLayout()
- # container.addLayout(self._create_logo())
- container.addLayout(self._create_title_layout())
- container.addLayout(self._create_new_session_button())
-
- self.setLayout(container)
-
- @property
- def new_session(self):
- return self._new_session_button
-
- def _create_title_layout(self):
- welcome_title_layout = QVBoxLayout()
-
- welcome_l1_title = QLabel("Welcome to FreeMoCap")
-
- set_font_size(welcome_l1_title, 30)
- welcome_title_layout.addWidget(welcome_l1_title)
- welcome_l1_title.setAlignment(Qt.AlignmentFlag.AlignCenter)
- return welcome_title_layout
-
- def _create_new_session_button(self):
- new_session_container = QHBoxLayout()
- new_session_container.addWidget(self._new_session_button)
- return new_session_container
-
- #
- # def _create_logo(self):
- # grid = QGridLayout()
- # label = QLabel()
- # pixmap = QPixmap('../images/skelly-3-4-22.png')
- # label.setPixmap(pixmap)
- # grid.addWidget(label, 1, 1)
- # return grid
diff --git a/src/gui/main/__init__.py b/src/gui/main/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/gui/main/app_state/app_state.py b/src/gui/main/app_state/app_state.py
deleted file mode 100644
index 60c9556d..00000000
--- a/src/gui/main/app_state/app_state.py
+++ /dev/null
@@ -1,17 +0,0 @@
-from typing import List
-
-from pydantic import BaseModel
-
-
-class AppState(BaseModel):
- session_id: str = None
- available_cameras: List[str] = []
- selected_cameras: List[str] = []
- camera_configs: dict = {}
- main_window_height: int = None
- main_window_width: int = None
- use_previous_calibration: bool = False
- rotate_videos_dict: dict = {}
-
-
-APP_STATE = AppState()
diff --git a/src/gui/main/custom_widgets/single_camera_widget.py b/src/gui/main/custom_widgets/single_camera_widget.py
deleted file mode 100644
index 2cc22741..00000000
--- a/src/gui/main/custom_widgets/single_camera_widget.py
+++ /dev/null
@@ -1,117 +0,0 @@
-import enum
-
-from PyQt6 import QtGui
-from PyQt6.QtCore import pyqtSignal, Qt
-from PyQt6.QtGui import QPixmap
-from PyQt6.QtWidgets import QWidget, QLabel, QFrame, QVBoxLayout
-
-from src.cameras.webcam_config import WebcamConfig
-from src.gui.main.workers.cam_charuco_frame_thread_worker import (
- CamCharucoFrameThreadWorker,
-)
-from src.gui.main.workers.cam_frame_worker import CamFrameWorker
-
-import logging
-
-logger = logging.getLogger(__name__)
-
-
-class WorkerType(enum.Enum):
- FRAME_CAPTURE = 0
- CHARUCO = 1
-
-
-def construct_worker(worker_type: WorkerType):
- if worker_type.CHARUCO:
- return CamCharucoFrameThreadWorker
-
- if worker_type.FRAME_CAPTURE:
- return CamFrameWorker
-
- raise Exception("What?")
-
-
-class SingleCameraWidget(QWidget):
- started = pyqtSignal()
-
- def __init__(self, webcam_config: WebcamConfig):
- super().__init__()
- self._webcam_config = webcam_config
-
- layout = QVBoxLayout()
- self.setLayout(layout)
-
- self._camera_name_str = f"Camera {self._webcam_config.webcam_id}"
- layout.addWidget(QLabel(self._camera_name_str))
-
- self._video_label = QLabel()
- self._video_label.setFrameStyle((QFrame.Panel | QFrame.Plain))
- self._video_label.setLineWidth(3)
- # self._video.setScaledContents(True)
-
- layout.addWidget(self._video_label)
-
- @property
- def should_record_frames(self):
- return self._worker.should_save_frames
-
- @property
- def video_recorder(self):
- return self._worker.video_recorder
-
- @property
- def opencv_camera_is_open(self):
- return self._worker.opencv_camera_is_open
-
- def start(self):
- self._worker = self._init_frame_worker()
- self._worker.start()
- self.started.emit()
-
- def quit(self):
- self._worker.quit()
-
- def start_saving_frames(self):
- self._worker.start_saving_frames()
-
- def stop_saving_frames(self):
- self._worker.stop_saving_frames()
-
- def reset_video_recorder(self):
- self._worker.reset_video_recorder()
-
- def _init_frame_worker(self):
- worker = construct_worker(WorkerType.CHARUCO)(self._webcam_config)
- worker.image_updated_signal.connect(self._handle_image_update)
- return worker
-
- def _handle_image_update(self, q_image):
- self._pixmap = QPixmap.fromImage(q_image)
-
- if (
- self._video_label.width() < self._webcam_config.resolution_width
- or self._video_label.height() < self._webcam_config.resolution_height
- ):
- scaled_width = self._video_label.width()
- scaled_height = self._video_label.height()
- else:
- scaled_width = self._webcam_config.resolution_width
- scaled_height = self._webcam_config.resolution_height
-
- self._pixmap = self._pixmap.scaled(
- scaled_width,
- scaled_height,
- Qt.KeepAspectRatio,
- Qt.SmoothTransformation,
- )
-
- self._video_label.setPixmap(self._pixmap)
-
- # def resizeEvent(self, a0: QtGui.QResizeEvent) -> None:
- # logging.info(f" Camera {self._webcam_config.webcam_id} window resized")
-
- # TO DO - Some kinda something here to make the videos scale properly and keep their aspect ratio
-
- def closeEvent(self, a0: QtGui.QCloseEvent) -> None:
- logging.info(f" Camera {self._webcam_config.webcam_id} window closed")
- self._worker.quit()
diff --git a/src/gui/main/custom_widgets/video_player_widget.py b/src/gui/main/custom_widgets/video_player_widget.py
deleted file mode 100644
index 0b6b81cb..00000000
--- a/src/gui/main/custom_widgets/video_player_widget.py
+++ /dev/null
@@ -1,55 +0,0 @@
-import enum
-from pathlib import Path
-from typing import Union
-
-import cv2
-import numpy as np
-from PyQt6 import QtGui
-from PyQt6.QtCore import pyqtSignal, Qt
-from PyQt6.QtGui import QPixmap, QImage
-from PyQt6.QtWidgets import QHBoxLayout, QWidget, QLabel
-
-import logging
-
-
-from src.gui.main.app_state.app_state import APP_STATE
-
-logger = logging.getLogger(__name__)
-
-
-class VideoPlayerWidget(QWidget):
- def __init__(self):
- super().__init__()
-
- self._video_view_label = QLabel()
- # self._video.setScaledContents(True)
- layout = QHBoxLayout()
- layout.addWidget(self._video_view_label)
-
- self.setLayout(layout)
-
- def update_image(self, image: np.ndarray):
- image = cv2.cvtColor(image, cv2.COLOR_BGR2RGB)
- q_image = QImage(
- image.data,
- image.shape[1],
- image.shape[0],
- QImage.Format.Format_RGB888,
- )
- # q_image = q_image.scaledToWidth(
- # APP_STATE.main_window_width / len(APP_STATE.available_cameras)
- # )
-
- q_image = q_image.scaledToWidth(200)
-
- self._pixmap = QPixmap.fromImage(q_image)
- self._video_view_label.setPixmap(self._pixmap)
-
- def resizeEvent(self, a0: QtGui.QResizeEvent) -> None:
- logging.debug(f"window resized")
-
- # TO DO - Some kinda something here to make the videos scale properly and keep their aspect ratio
-
- # self._pixmap.scaled(
- # self.width(), self.height(), Qt.KeepAspectRatio, Qt.SmoothTransformation
- # )
diff --git a/src/gui/main/main.py b/src/gui/main/main.py
deleted file mode 100644
index 9bb69cf2..00000000
--- a/src/gui/main/main.py
+++ /dev/null
@@ -1,53 +0,0 @@
-import logging
-import signal
-import sys
-
-from PyQt6.QtCore import QTimer
-from PyQt6.QtWidgets import QApplication
-
-from pathlib import Path
-
-repo = Path(__file__).parent.parent.parent.parent
-sys.path.insert(0, str(repo))
-
-
-from src.gui.main.style_stuff.css_style_sheet import qt_app_css_style_sheet
-
-from src.gui.main.app import get_qt_app
-from src.gui.main.main_window.main_window import MainWindow, EXIT_CODE_REBOOT
-
-logger = logging.getLogger(__name__)
-
-loop_count = -1
-
-
-def sigint_handler(*args):
- """Handler for the SIGINT signal."""
- QApplication.quit()
-
-
-if __name__ == "__main__":
- logger.info("Starting main...")
- signal.signal(signal.SIGINT, sigint_handler)
- app = get_qt_app()
- app.setStyleSheet(qt_app_css_style_sheet)
- timer = QTimer()
- timer.start(500)
- timer.timeout.connect(
- lambda: None
- ) # Let the interpreter calculate_center_of_mass each 500 ms.
-
- while True:
- # rebootable GUI method based on this - https://stackoverflow.com/a/56563926/14662833
- win = MainWindow()
- win.show()
- error_code = app.exec()
- logger.info(f"`main` exited with error code: {error_code}")
- win.close()
- if error_code != EXIT_CODE_REBOOT:
- logger.info(f"Exiting...")
- break
- else:
- logger.info("`main` exited with the 'reboot' code, so let's reboot!")
-
- sys.exit()
diff --git a/src/gui/main/main_window/__init__.py b/src/gui/main/main_window/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/gui/main/main_window/left_panel_controls/__init__.py b/src/gui/main/main_window/left_panel_controls/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/gui/main/main_window/left_panel_controls/control_panel.py b/src/gui/main/main_window/left_panel_controls/control_panel.py
deleted file mode 100644
index 377914bd..00000000
--- a/src/gui/main/main_window/left_panel_controls/control_panel.py
+++ /dev/null
@@ -1,112 +0,0 @@
-from PyQt6.QtWidgets import (
- QFrame,
- QVBoxLayout,
- QToolBox,
-)
-
-from src.gui.main.main_window.left_panel_controls.toolbox_widgets.calibrate_capture_volume_panel import (
- CalibrateCaptureVolumePanel,
-)
-from src.gui.main.main_window.left_panel_controls.toolbox_widgets.camera_setup_control_panel import (
- CameraSetupControlPanel,
-)
-from src.gui.main.main_window.left_panel_controls.toolbox_widgets.motion_capture_panel import (
- MotionCapturePanel,
-)
-
-
-import logging
-
-logger = logging.getLogger(__name__)
-
-panel_title_strings = {
- "cameras": "1 - Camera Setup and Control",
- "calibration": "2 - Capture Volume Calibration",
- "mocap": "3 - Record/Process/Visualize Motion Capture Data",
-}
-
-
-class ControlPanel:
- def __init__(self):
- self._frame = QFrame()
- self._frame.setFrameShape(QFrame.Shape.StyledPanel)
- self._layout = QVBoxLayout()
- self._frame.setLayout(self._layout)
-
- self._dictionary_of_toolbox_panels = self._create_dictionary_of_toolbox_panels()
- self._toolbox_widget = self._create_toolbox_widget()
- self._hide_toolbox_panels()
- self._toolbox_widget.setEnabled(False)
- self._layout.addWidget(self._toolbox_widget)
-
- @property
- def frame(self):
- return self._frame
-
- # @property
- # def create_or_load_new_session_panel(self):
- # return self._create_or_load_new_session_panel
-
- @property
- def camera_setup_control_panel(self):
- return self._dictionary_of_toolbox_panels[panel_title_strings["cameras"]]
-
- @property
- def calibrate_capture_volume_panel(self):
- return self._dictionary_of_toolbox_panels[panel_title_strings["calibration"]]
-
- @property
- def motion_capture_panel(self):
- return self._dictionary_of_toolbox_panels[panel_title_strings["mocap"]]
-
- @property
- def process_session_data_panel(self):
- return self.motion_capture_panel.process_session_data_panel
-
- @property
- def visualize_session_data_panel(self):
- return self.motion_capture_panel.visualize_session_data_panel
-
- @property
- def toolbox_widget(self):
- return self._toolbox_widget
-
- def show_toolbox_panels(self):
- for panel in self._dictionary_of_toolbox_panels.values():
- panel.show()
-
- def _create_toolbox_widget(self):
- toolbox_widget = QToolBox()
-
- for item_name, panel in self._dictionary_of_toolbox_panels.items():
- toolbox_widget.addItem(panel, item_name)
- toolbox_widget.setCurrentWidget(panel)
- return toolbox_widget
-
- def _create_dictionary_of_toolbox_panels(self):
- dictionary_of_toolbox_panels = {}
- # self._create_or_load_new_session_panel = WelcomeCreateOrLoadNewSessionPanel()
- dictionary_of_toolbox_panels[
- panel_title_strings["cameras"]
- ] = CameraSetupControlPanel()
- dictionary_of_toolbox_panels[
- panel_title_strings["calibration"]
- ] = CalibrateCaptureVolumePanel()
- dictionary_of_toolbox_panels[
- panel_title_strings["mocap"]
- ] = MotionCapturePanel()
-
- # self._process_session_data_panel = ProcessSessionDataPanel()
- return dictionary_of_toolbox_panels
-
- def _hide_toolbox_panels(self):
- for panel in self._dictionary_of_toolbox_panels.values():
- panel.hide()
-
- def _show_toolbox_panels(self):
- for panel in self._dictionary_of_toolbox_panels.values():
- panel.show()
-
- def enable_toolbox_panels(self):
- self._toolbox_widget.setEnabled(True)
- self._show_toolbox_panels()
diff --git a/src/gui/main/main_window/left_panel_controls/toolbox_widgets/__init__.py b/src/gui/main/main_window/left_panel_controls/toolbox_widgets/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/gui/main/main_window/left_panel_controls/toolbox_widgets/calibrate_capture_volume_panel.py b/src/gui/main/main_window/left_panel_controls/toolbox_widgets/calibrate_capture_volume_panel.py
deleted file mode 100644
index 381633c6..00000000
--- a/src/gui/main/main_window/left_panel_controls/toolbox_widgets/calibrate_capture_volume_panel.py
+++ /dev/null
@@ -1,282 +0,0 @@
-import logging
-from pathlib import Path
-
-from PyQt6.QtCore import Qt
-from PyQt6.QtWidgets import (
- QWidget,
- QVBoxLayout,
- QPushButton,
- QCheckBox,
- QFormLayout,
- QLineEdit,
- QComboBox,
- QLabel,
- QFileDialog,
- QRadioButton,
-)
-
-from src.core_processes.capture_volume_calibration.charuco_board_detection.dataclasses.charuco_board_definition import (
- CharucoBoardDefinition,
-)
-from src.core_processes.capture_volume_calibration.charuco_board_detection.default_charuco_square_size import (
- default_charuco_square_size_mm,
-)
-from src.gui.main.style_stuff.styled_widgets.panel_section_title import (
- PanelSectionTitle,
-)
-
-logger = logging.getLogger(__name__)
-
-
-class CalibrateCaptureVolumePanel(QWidget):
- def __init__(self):
- super().__init__()
-
- self._layout = QVBoxLayout()
- self.setLayout(self._layout)
-
- self._layout.addStretch()
-
- self._layout.addWidget(PanelSectionTitle("Calibration Data Source"))
- self._use_most_recent_calibration_radio_button = QRadioButton(
- "Use Most Recent Calibration"
- )
- self._use_most_recent_calibration_radio_button.toggled.connect(
- self._handle_use_previous_calibration_radio_button_toggled
- )
- self._layout.addWidget(self._use_most_recent_calibration_radio_button)
-
- self._load_camera_calibration_radio_button = QRadioButton(
- "Load Camera Calibration .toml file..."
- )
- self._layout.addWidget(self._load_camera_calibration_radio_button)
- self._load_camera_calibration_radio_button.toggled.connect(
- self._handle_load_camera_calibration_radio_button_toggled
- )
-
- self._load_calibration_toml_dialog_button = QPushButton(
- "Load Camera Calibration TOML..."
- )
- self._layout.addWidget(self._load_calibration_toml_dialog_button)
- self._load_calibration_toml_dialog_button.clicked.connect(
- self._open_load_camera_calibration_toml_dialog
- )
- self._load_calibration_toml_dialog_button.setToolTip(
- "locate the camera_calibration.toml file from a previous calibration"
- )
-
- self._user_selected_camera_calibration_toml_path_label = QLabel(
- "- No Camera Calibration TOML Loaded -"
- )
- self._user_selected_camera_calibration_toml_path_label.setWordWrap(True)
- self._layout.addWidget(self._user_selected_camera_calibration_toml_path_label)
-
- self._load_calibration_toml_dialog_button.setEnabled(False)
- self._user_selected_camera_calibration_toml_path_label.setEnabled(False)
-
- self._calibrate_from_synchronized_videos_radio_button = QRadioButton(
- "Calibrate from `synchronized_videos` folder"
- )
- self._layout.addWidget(self._calibrate_from_synchronized_videos_radio_button)
- self._calibrate_from_synchronized_videos_radio_button.toggled.connect(
- self._handle_calibrate_from_synchronized_videos_radio_button_toggled
- )
-
- self._record_calibration_videos_radio_button = QRadioButton(
- "Record New Calibration Videos"
- )
- self._layout.addWidget(self._record_calibration_videos_radio_button)
- self._record_calibration_videos_radio_button.setChecked(True)
- self._record_calibration_videos_radio_button.toggled.connect(
- self._handle_record_calibration_videos_radio_button_toggled
- )
- # start/stop recording button layout
- record_buttons_layout = QVBoxLayout()
- self._layout.addLayout(record_buttons_layout)
-
- self._start_recording_button = QPushButton("Begin Recording")
- record_buttons_layout.addWidget(self._start_recording_button)
-
- self._stop_recording_button = QPushButton("Stop Recording")
- self._stop_recording_button.setEnabled(False)
- record_buttons_layout.addWidget(self._stop_recording_button)
- self._process_automatically_checkbox = QCheckBox(
- "Process Calibration Videos Automatically"
- )
- self._process_automatically_checkbox.setChecked(True)
- self._process_automatically_checkbox.stateChanged.connect(
- self._enable_or_disable_calibrate_from_videos_button
- )
- self._layout.addWidget(self._process_automatically_checkbox)
-
- self._layout.addWidget(QLabel("___"), alignment=Qt.AlignCenter)
-
- camera_warning_qlabel = QLabel(
- "NOTE - For faster processing, shut down your cameras when you're done recording (i.e. press `Stop Cameras` in the 'Cameras' tab)"
- )
- camera_warning_qlabel.setWordWrap(True)
- self._layout.addWidget(camera_warning_qlabel)
-
- self._layout.addWidget(
- QLabel("Calibrate Capture Volume"), alignment=Qt.AlignCenter
- )
-
- self._calibrate_capture_volume_from_videos_button = QPushButton(
- "Calibrate Capture Volume From Videos"
- )
- self._calibrate_capture_volume_from_videos_button.setEnabled(True)
- self._calibrate_capture_volume_from_videos_button.setToolTip(
- "Looks for a `calibration_videos` folder first, reverting to `synchronized_videos` if not found"
- )
- self._layout.addWidget(
- self._calibrate_capture_volume_from_videos_button,
- )
-
- self._layout.addWidget(
- QLabel("Calibration Parameters:"), alignment=Qt.AlignCenter
- )
-
- qlabel_link_to_charuco_board = QLabel()
- qlabel_link_to_charuco_board.setText(
- '<a href="https://raw.githubusercontent.com/freemocap/freemocap/main/assets/charuco/charuco_board_image_highRes.png">Link to Charuco Board Image</a>'
- )
- qlabel_link_to_charuco_board.setOpenExternalLinks(True)
- qlabel_link_to_charuco_board.setWordWrap(True)
- self._layout.addWidget(qlabel_link_to_charuco_board)
-
- self._charuco_square_size_form_layout = QFormLayout()
- self._charuco_square_size_line_edit_widget = QLineEdit()
- self._charuco_square_size_line_edit_widget.setToolTip(
- "The length of one of the edges of the black squares in the calibration board in mm"
- )
- self._charuco_square_size_line_edit_widget.setText(
- str(default_charuco_square_size_mm)
- )
- self._charuco_square_size_form_layout.addRow(
- "Charuco Square Size (mm):", self._charuco_square_size_line_edit_widget
- )
-
- self._layout.addLayout(self._charuco_square_size_form_layout)
-
- self._layout.addWidget(QLabel("Charuco Checkerboard Type:"))
- self._charuco_board_definition = CharucoBoardDefinition()
- self._charuco_combo_box = QComboBox()
- self._charuco_combo_box.addItem("Pre-Alpha (5x7 squares)")
- # self._charuco_combo_box.addItem("Bigger Squares (3x5 squares)")
-
- self._layout.addWidget(self._charuco_combo_box)
-
- self._layout.addStretch()
-
- @property
- def process_recording_automatically_checkbox(self):
- return self._process_automatically_checkbox
-
- @property
- def start_recording_button(self):
- return self._start_recording_button
-
- @property
- def stop_recording_button(self):
- return self._stop_recording_button
-
- @property
- def calibrate_capture_volume_from_videos_button(self):
- return self._calibrate_capture_volume_from_videos_button
-
- @property
- def use_previous_calibration_box_is_checked(self):
- return self._use_most_recent_calibration_radio_button.isChecked()
-
- @property
- def load_camera_calibration_checkbox_is_checked(self):
- return self._load_camera_calibration_radio_button.isChecked()
-
- @property
- def charuco_square_size(self) -> float:
- return float(self._charuco_square_size_line_edit_widget.text())
-
- @property
- def charuco_combo_box_selection(self):
- return self._charuco_combo_box.currentText()
-
- @property
- def user_selected_calibration_toml_path(self):
- return self._user_selected_camera_calibration_toml_path_label.text()
-
- def _enable_or_disable_calibrate_from_videos_button(self):
- logger.debug("Process calibration videos automatically checkbox state changed")
- if self._process_automatically_checkbox.isChecked():
- self._calibrate_capture_volume_from_videos_button.setEnabled(False)
- else:
- self._calibrate_capture_volume_from_videos_button.setEnabled(True)
-
- def change_button_states_on_record_start(self):
- self._start_recording_button.setEnabled(False)
- self._start_recording_button.setText("Recording...")
- self._stop_recording_button.setEnabled(True)
-
- def change_button_states_on_record_stop(self):
- self._stop_recording_button.setEnabled(False)
- self._start_recording_button.setEnabled(True)
- self._start_recording_button.setText("Begin Recording")
- self._calibrate_capture_volume_from_videos_button.setEnabled(True)
-
- def _handle_use_previous_calibration_radio_button_toggled(self):
-
- self._disable_load_camera_calibration_stuff()
- self._disable_record_new_calibration_videos_stuff()
- self._enable_calibration_parameters_stuff(False)
-
- def _handle_load_camera_calibration_radio_button_toggled(self):
- self._load_calibration_toml_dialog_button.setEnabled(True)
- self._user_selected_camera_calibration_toml_path_label.setEnabled(True)
- self._disable_record_new_calibration_videos_stuff()
- self._enable_calibration_parameters_stuff(False)
-
- def _handle_calibrate_from_synchronized_videos_radio_button_toggled(self):
- self._disable_record_new_calibration_videos_stuff()
- self._disable_load_camera_calibration_stuff()
- self._enable_calibration_parameters_stuff(True)
- self._calibrate_capture_volume_from_videos_button.setEnabled(True)
-
- def _handle_record_calibration_videos_radio_button_toggled(self):
- self._enable_record_new_calibration_videos_stuff()
- self._disable_load_camera_calibration_stuff()
- self._enable_calibration_parameters_stuff(True)
-
- def _open_load_camera_calibration_toml_dialog(self):
- # from this tutorial - https://www.youtube.com/watch?v=gg5TepTc2Jg&t=649s
- calibration_toml_path_selection = QFileDialog.getOpenFileName(
- self,
- "Select 'toml' containing camera calibration info (Note - this is the 'toml' file produced by the `anipose` calibration process)",
- str(Path.home()),
- "Camera Calibration TOML (*.toml)",
- )
- self.calibration_toml_path_str = calibration_toml_path_selection[0]
- logger.info(
- f"User selected camera calibration toml path:{self.calibration_toml_path_str}"
- )
- self._user_selected_camera_calibration_toml_path_label.setText(
- self.calibration_toml_path_str
- )
-
- def _disable_record_new_calibration_videos_stuff(self):
- self._start_recording_button.setEnabled(False)
- self._stop_recording_button.setEnabled(False)
- self._process_automatically_checkbox.setEnabled(False)
- self._calibrate_capture_volume_from_videos_button.setEnabled(False)
-
- def _enable_record_new_calibration_videos_stuff(self):
- self._start_recording_button.setEnabled(True)
- self._stop_recording_button.setEnabled(True)
- self._process_automatically_checkbox.setEnabled(True)
- self._calibrate_capture_volume_from_videos_button.setEnabled(True)
-
- def _disable_load_camera_calibration_stuff(self):
- self._load_calibration_toml_dialog_button.setEnabled(False)
- self._user_selected_camera_calibration_toml_path_label.setEnabled(False)
-
- def _enable_calibration_parameters_stuff(self, bool_in: bool):
- self._charuco_combo_box.setEnabled(bool_in)
- self._charuco_square_size_line_edit_widget.setEnabled(bool_in)
diff --git a/src/gui/main/main_window/left_panel_controls/toolbox_widgets/camera_setup_control_panel.py b/src/gui/main/main_window/left_panel_controls/toolbox_widgets/camera_setup_control_panel.py
deleted file mode 100644
index 7de0209a..00000000
--- a/src/gui/main/main_window/left_panel_controls/toolbox_widgets/camera_setup_control_panel.py
+++ /dev/null
@@ -1,236 +0,0 @@
-from typing import Dict
-
-import cv2
-from PyQt6.QtCore import pyqtSignal
-from PyQt6.QtWidgets import (
- QVBoxLayout,
- QWidget,
- QPushButton,
- QLabel,
- QHBoxLayout,
-)
-from pyqtgraph.parametertree import ParameterTree, Parameter
-
-from src.cameras.detection.models import FoundCamerasResponse
-from src.cameras.webcam_config import WebcamConfig
-from src.gui.main.qt_utils.clear_layout import clear_layout
-
-import logging
-
-from src.gui.workflow_helper_blurbs.camera_setup_control_panel_help_blurb import (
- camera_setup_control_panel_help_blurb_str,
-)
-
-logger = logging.getLogger(__name__)
-
-
-def rotate_image_str_to_cv2_code(rotate_str: str):
-
- if rotate_str == "90_clockwise":
- return cv2.ROTATE_90_CLOCKWISE
- elif rotate_str == "90_counterclockwise":
- return cv2.ROTATE_90_COUNTERCLOCKWISE
- elif rotate_str == "180":
- return cv2.ROTATE_180
-
- return None
-
-
-def rotate_cv2_code_to_str(rotate_video_value):
- if rotate_video_value is None:
- return None
- elif rotate_video_value == cv2.ROTATE_90_CLOCKWISE:
- return "90_clockwise"
- elif rotate_video_value == cv2.ROTATE_90_COUNTERCLOCKWISE:
- return "90_counterclockwise"
- elif rotate_video_value == cv2.ROTATE_180:
- return "180"
-
-
-class CameraSetupControlPanel(QWidget):
-
- camera_parameters_updated_signal = pyqtSignal(dict)
- new_webcam_configs_received_signal = pyqtSignal(dict)
-
- def __init__(self):
- super().__init__()
- self._layout = QVBoxLayout()
- self.setLayout(self._layout)
-
- helper_qlabel_widget = QLabel(camera_setup_control_panel_help_blurb_str)
- helper_qlabel_widget.setWordWrap(True)
- self._layout.addWidget(helper_qlabel_widget)
-
- camera_warning_label = QLabel(
- "NOTE -\nThe current version of the GUI is inefficient and will start dropping frames with ~3+ cameras. This will be fixed in a future version.\n\n"
- "In the meantime, to use more cameras, record them with the `pre-alpha` version of FreeMoCap and import the `[freemocap_data]/[session_id]/SyncedVideos` folder files into the GUI with the `Import Videos` functionality."
- )
- camera_warning_label.setWordWrap(True)
- camera_warning_label.setStyleSheet("color: #770000")
- self._layout.addWidget(camera_warning_label)
- self._layout.addWidget(QLabel())
-
- self._redetect_cameras_button = QPushButton("Detect Cameras")
- self._redetect_cameras_button.setEnabled(True)
- self._layout.addWidget(self._redetect_cameras_button)
-
- self._apply_settings_to_cameras_button = QPushButton(
- "Apply settings and Launch Cameras",
- )
- self._apply_settings_to_cameras_button.setEnabled(True)
- self._layout.addWidget(self._apply_settings_to_cameras_button)
-
- self._pop_dock_buttons_layout = QHBoxLayout()
- self._layout.addLayout(self._pop_dock_buttons_layout)
-
- self._pop_out_cameras_button = QPushButton("Pop out cameras")
- self._pop_out_cameras_button.setEnabled(True)
- self._pop_dock_buttons_layout.addWidget(self._pop_out_cameras_button)
-
- self._dock_cameras_button = QPushButton("Dock cameras")
- self._dock_cameras_button.setEnabled(False)
- self._pop_dock_buttons_layout.addWidget(self._dock_cameras_button)
-
- self._close_cameras_button = QPushButton("Close cameras")
- self._close_cameras_button.setEnabled(True)
- self._layout.addWidget(self._close_cameras_button)
-
- self._parameter_tree_layout = QVBoxLayout()
- self._parameter_tree_widget = ParameterTree()
- self._parameter_tree_layout.addWidget(self._parameter_tree_widget)
- self._layout.addLayout(self._parameter_tree_layout)
-
- @property
- def apply_settings_to_cameras_button(self):
- return self._apply_settings_to_cameras_button
-
- @property
- def redetect_cameras_button(self):
- return self._redetect_cameras_button
-
- @property
- def pop_out_cameras_button(self):
- return self._pop_out_cameras_button
-
- @property
- def dock_cameras_button(self):
- return self._dock_cameras_button
-
- @property
- def close_cameras_button(self):
- return self._close_cameras_button
-
- def handle_found_cameras_response(
- self, found_cameras_response: FoundCamerasResponse
- ):
- self._list_of_available_camera_ids = found_cameras_response.cameras_found_list
-
- logger.info(f"Found cameras with IDs: {self._list_of_available_camera_ids}")
-
- dictionary_of_webcam_configs = {}
- for camera_id in self._list_of_available_camera_ids:
- dictionary_of_webcam_configs[camera_id] = WebcamConfig(webcam_id=camera_id)
-
- self._update_camera_config_parameter_tree(dictionary_of_webcam_configs)
-
- def _update_camera_config_parameter_tree(
- self, dictionary_of_webcam_configs: Dict[str, WebcamConfig]
- ):
- logger.info("Updating camera configs")
- clear_layout(self._parameter_tree_layout)
- self._parameter_tree_widget = ParameterTree()
- self._parameter_tree_layout.addWidget(self._parameter_tree_widget)
-
- self._camera_parameter_groups_dictionary = {}
- for webcam_id in self._list_of_available_camera_ids:
- if not webcam_id in dictionary_of_webcam_configs:
-
- self._camera_parameter_groups_dictionary[
- webcam_id
- ] = self._create_webcam_parameter_tree_for_unselected_camera(webcam_id)
- else:
- self._camera_parameter_groups_dictionary[
- webcam_id
- ] = self._create_webcam_parameter_tree(
- dictionary_of_webcam_configs[webcam_id]
- )
-
- self._parameter_tree_widget.addParameters(
- self._camera_parameter_groups_dictionary[webcam_id]
- )
-
- self.camera_parameters_updated_signal.emit(dictionary_of_webcam_configs)
-
- def get_webcam_configs_from_parameter_tree(self):
- new_selected_cameras_list = []
- new_camera_configs_dict = {}
-
- for (
- camera_id,
- camera_parameter_group,
- ) in self._camera_parameter_groups_dictionary.items():
- if camera_parameter_group.param("Use this camera?").value():
- new_selected_cameras_list.append(camera_id)
- try:
- new_camera_configs_dict[camera_id] = WebcamConfig(
- webcam_id=camera_id,
- exposure=camera_parameter_group.param("Exposure").value(),
- resolution_width=camera_parameter_group.param(
- "Resolution Width"
- ).value(),
- resolution_height=camera_parameter_group.param(
- "Resolution Height"
- ).value(),
- rotate_video_cv2_code=rotate_image_str_to_cv2_code(
- camera_parameter_group.param("Rotate Image").value()
- ),
- )
- except Exception as e:
- logger.error(
- f"Problem creating webcam config from parameter tree for camera: {camera_id} "
- )
- raise e
-
- return new_camera_configs_dict
-
- def _create_webcam_parameter_tree(self, webcam_config: WebcamConfig):
- try:
- rotate_video_value = rotate_cv2_code_to_str(
- webcam_config.rotate_video_cv2_code
- )
- except KeyError:
- rotate_video_value = "None"
-
- return Parameter.create(
- name="Camera_" + str(webcam_config.webcam_id),
- type="group",
- children=[
- dict(name="Use this camera?", type="bool", value=True),
- dict(
- name="Rotate Image",
- type="list",
- limits=["None", "90_clockwise", "90_counterclockwise", "180"],
- value=rotate_video_value,
- ),
- dict(name="Exposure", type="int", value=webcam_config.exposure),
- dict(
- name="Resolution Width",
- type="int",
- value=webcam_config.resolution_width,
- ),
- dict(
- name="Resolution Height",
- type="int",
- value=webcam_config.resolution_height,
- ),
- ],
- )
-
- def _create_webcam_parameter_tree_for_unselected_camera(self, webcam_id):
- return Parameter.create(
- name="Camera_" + str(webcam_id),
- type="group",
- children=[
- dict(name="Use this camera?", type="bool", value=False),
- ],
- )
diff --git a/src/gui/main/main_window/left_panel_controls/toolbox_widgets/motion_capture_panel.py b/src/gui/main/main_window/left_panel_controls/toolbox_widgets/motion_capture_panel.py
deleted file mode 100644
index 5e5bd970..00000000
--- a/src/gui/main/main_window/left_panel_controls/toolbox_widgets/motion_capture_panel.py
+++ /dev/null
@@ -1,97 +0,0 @@
-from PyQt6.QtCore import QLine, Qt
-from PyQt6.QtWidgets import (
- QPushButton,
- QVBoxLayout,
- QWidget,
- QCheckBox,
- QLabel,
-)
-
-from src.gui.main.main_window.left_panel_controls.toolbox_widgets.process_session_data_panel import (
- ProcessSessionDataPanel,
-)
-from src.gui.main.main_window.left_panel_controls.toolbox_widgets.visualize_motion_capture_data import (
- VisualizeMotionCaptureDataPanel,
-)
-from src.gui.main.style_stuff.styled_widgets.panel_section_title import (
- PanelSectionTitle,
-)
-
-
-class MotionCapturePanel(QWidget):
- def __init__(self):
- super().__init__()
-
- self._layout = QVBoxLayout()
- self.setLayout(self._layout)
-
- self._layout.addStretch()
- self._layout.addWidget(
- PanelSectionTitle("Record Synchronized Videos"), alignment=Qt.AlignCenter
- )
- self._start_recording_button = QPushButton("Begin Recording")
- self._layout.addWidget(self._start_recording_button)
-
- self._stop_recording_button = QPushButton("Stop Recording")
- self._stop_recording_button.setEnabled(False)
- self._layout.addWidget(self._stop_recording_button)
-
- self._process_automatically_checkbox = QCheckBox(
- "Process Recording Automatically"
- )
- self._process_automatically_checkbox.setChecked(True)
- self._layout.addWidget(self._process_automatically_checkbox)
-
- self._layout.addWidget(QLabel("___"), alignment=Qt.AlignCenter)
-
- process_videos_section_title = PanelSectionTitle("Process Videos")
- self._layout.addWidget(process_videos_section_title, alignment=Qt.AlignCenter)
- process_videos_section_title.setToolTip(
- "TODO: \n"
- + "- Convert this mess of buttons into a 'Parameter Tree' like the one in the 'Camera Setup' panel (see `src/core_processes/batch_processes/process_session_folder.py`)\n\n"
- + "- Add method to check what's in the `session_folder` and only enable the appropriate buttons"
- )
-
- self._process_session_data_panel = ProcessSessionDataPanel()
-
- self._layout.addWidget(self._process_session_data_panel)
-
- self._layout.addWidget(QLabel("___"), alignment=Qt.AlignCenter)
-
- self._layout.addWidget(
- PanelSectionTitle("Visualize Data"), alignment=Qt.AlignCenter
- )
- self._visualize_motion_capture_data_panel = VisualizeMotionCaptureDataPanel()
-
- self._layout.addWidget(self._visualize_motion_capture_data_panel)
- self._layout.addStretch()
-
- @property
- def process_session_data_panel(self):
- return self._process_session_data_panel
-
- @property
- def visualize_session_data_panel(self):
- return self._visualize_motion_capture_data_panel
-
- @property
- def process_recording_automatically_checkbox(self):
- return self._process_automatically_checkbox
-
- @property
- def start_recording_button(self):
- return self._start_recording_button
-
- @property
- def stop_recording_button(self):
- return self._stop_recording_button
-
- def change_button_states_on_record_start(self):
- self._start_recording_button.setEnabled(False)
- self._start_recording_button.setText("Recording...")
- self._stop_recording_button.setEnabled(True)
-
- def change_button_states_on_record_stop(self):
- self._stop_recording_button.setEnabled(False)
- self._start_recording_button.setEnabled(True)
- self._start_recording_button.setText("Begin Recording")
diff --git a/src/gui/main/main_window/left_panel_controls/toolbox_widgets/process_session_data_panel.py b/src/gui/main/main_window/left_panel_controls/toolbox_widgets/process_session_data_panel.py
deleted file mode 100644
index 3ce735b2..00000000
--- a/src/gui/main/main_window/left_panel_controls/toolbox_widgets/process_session_data_panel.py
+++ /dev/null
@@ -1,141 +0,0 @@
-import logging
-
-from PyQt6.QtWidgets import (
- QWidget,
- QVBoxLayout,
- QPushButton,
- QCheckBox,
- QFormLayout,
- QLineEdit,
- QFileDialog,
- QLabel,
-)
-
-
-from src.core_processes.mediapipe_stuff.mediapipe_default_settings import (
- default_mediapipe_confidence_threshold,
-)
-
-from src.gui.main.tool_tips_and_warning_labels.tool_tips_strings import (
- mediapipe_confidence_cutoff_tool_tip_str,
-)
-
-logger = logging.getLogger(__name__)
-
-
-class ProcessSessionDataPanel(QWidget):
- def __init__(self):
- super().__init__()
-
- self._layout = QVBoxLayout()
- self.setLayout(self._layout)
-
- self._layout.addStretch()
-
- camera_warning_qlabel = QLabel(
- "NOTE - For faster processing, shut down your cameras when you're done recording (i.e. press `Stop Cameras` in the 'Cameras' tab)"
- )
- camera_warning_qlabel.setWordWrap(True)
- self._layout.addWidget(camera_warning_qlabel)
-
- self._process_all_button = QPushButton("Process All Steps Below")
- self._process_all_button.setEnabled(True)
- self._layout.addWidget(self._process_all_button)
-
- self._open_in_blender_automatically_checkbox = QCheckBox(
- "Open in Blender automatically"
- )
- self._open_in_blender_automatically_checkbox.setChecked(True)
- self._layout.addWidget(self._open_in_blender_automatically_checkbox)
-
- self._detect_2d_skeletons_button = QPushButton(
- "(a) - Detect 2d Skeletons in Videos"
- )
- self._detect_2d_skeletons_button.setEnabled(True)
- self._layout.addWidget(self._detect_2d_skeletons_button)
-
- self._triangulate_3d_data_button = QPushButton("(b) - Triangulate 3d Data")
- self._triangulate_3d_data_button.setEnabled(True)
- self._layout.addWidget(self._triangulate_3d_data_button)
-
- self._use_triangulate_ransac_checkbox = QCheckBox(
- "Use `anipose.triangulate_ransac() - EXPERIMENTAL"
- )
- self._use_triangulate_ransac_checkbox.setChecked(False)
- self._layout.addWidget(self._use_triangulate_ransac_checkbox)
-
- self._mediapipe_confidence_cutoff_form_layout = (
- self._make_mediapipe_confidence_cutoff_layout()
- )
- self._layout.addLayout(self._mediapipe_confidence_cutoff_form_layout)
-
- self._gap_fill_filter_origin_align_button = QPushButton(
- "(c) - Post-process data"
- )
- self._gap_fill_filter_origin_align_button.setToolTip(
- "Gap Fill, Butterworth Filter, and Origin Align Skeletons"
- )
- self._layout.addWidget(self._gap_fill_filter_origin_align_button)
-
- self._convert_npy_to_csv_button = QPushButton(
- "(d) - Convert 3D npy data to csv"
- )
- self._layout.addWidget(self._convert_npy_to_csv_button)
-
- self._layout.addStretch()
-
- @property
- def process_all_button(self):
- return self._process_all_button
-
- @property
- def open_in_blender_automatically_checkbox(self):
- return self._open_in_blender_automatically_checkbox
-
- @property
- def detect_2d_skeletons_button(self):
- return self._detect_2d_skeletons_button
-
- @property
- def mediapipe_confidence_cutoff_threshold(self) -> float:
- return float(self._mediapipe_confidence_cutoff_line_edit_widget.text())
-
- @property
- def use_triangulate_ransac_checkbox(self):
- return self._use_triangulate_ransac_checkbox
-
- @property
- def convert_npy_to_csv_button(self):
- return self._convert_npy_to_csv_button
-
- @property
- def triangulate_3d_data_button(self):
- return self._triangulate_3d_data_button
-
- @property
- def gap_fill_filter_origin_align_button(self):
- return self._gap_fill_filter_origin_align_button
-
- @property
- def blender_exe_path_str(self):
- return self._blender_exe_path_str
-
- def _make_mediapipe_confidence_cutoff_layout(self):
- layout = QFormLayout()
- self._mediapipe_confidence_cutoff_line_edit_widget = (
- self._create_mediapipe_confidence_cutoff_line_edit_widget()
- )
- layout.addRow(
- "Mediapipe 2d confidence cut-off:",
- self._mediapipe_confidence_cutoff_line_edit_widget,
- )
-
- return layout
-
- def _create_mediapipe_confidence_cutoff_line_edit_widget(self):
- q_line_edit_widget = QLineEdit()
- q_line_edit_widget.setText(str(default_mediapipe_confidence_threshold))
-
- q_line_edit_widget.setToolTip(mediapipe_confidence_cutoff_tool_tip_str)
-
- return q_line_edit_widget
diff --git a/src/gui/main/main_window/left_panel_controls/toolbox_widgets/visualize_motion_capture_data.py b/src/gui/main/main_window/left_panel_controls/toolbox_widgets/visualize_motion_capture_data.py
deleted file mode 100644
index 7992494e..00000000
--- a/src/gui/main/main_window/left_panel_controls/toolbox_widgets/visualize_motion_capture_data.py
+++ /dev/null
@@ -1,150 +0,0 @@
-import logging
-
-from PyQt6.QtCore import Qt
-from PyQt6.QtWidgets import (
- QWidget,
- QVBoxLayout,
- QPushButton,
- QLabel,
- QFileDialog,
- QHBoxLayout,
-)
-
-from src.blender_stuff.get_best_guess_of_blender_path import (
- get_best_guess_of_blender_path,
-)
-from src.gui.main.style_stuff.styled_widgets.panel_section_title import (
- PanelSectionTitle,
-)
-
-
-logger = logging.getLogger(__name__)
-
-
-class VisualizeMotionCaptureDataPanel(QWidget):
- def __init__(self):
- super().__init__()
-
- self._layout = QVBoxLayout()
- self.setLayout(self._layout)
-
- self._load_session_data_button = QPushButton(
- "Show Session Data Viewer",
- )
- self._load_session_data_button.setEnabled(True)
- self._layout.addWidget(self._load_session_data_button)
- self._load_session_data_button.clicked.connect(
- self._handle_load_session_data_button_clicked,
- )
-
- self._play_pause_button_layout = QHBoxLayout()
- self._layout.addLayout(self._play_pause_button_layout)
-
- self._play_button = QPushButton("TODO - Play")
- self._play_button.setEnabled(False)
- self._play_pause_button_layout.addWidget(self._play_button)
- self._play_button.clicked.connect(self._handle_play_button_clicked)
-
- self._pause_button = QPushButton("TODO - Pause")
- self._pause_button.setEnabled(False)
- self._play_pause_button_layout.addWidget(self._pause_button)
- self._pause_button.clicked.connect(self._handle_pause_button_clicked)
-
- self._layout.addWidget(QLabel("___"), alignment=Qt.AlignCenter)
-
- self._layout.addWidget(
- PanelSectionTitle("Export to Blender"), alignment=Qt.AlignCenter
- )
-
- self._blender_path_form_layout = self._make_blender_path_layout()
- self._layout.addLayout(self._blender_path_form_layout)
-
- self._generate_blend_file_button = QPushButton(
- "Generate `.blend` file (Freezes GUI, sorry!)"
- )
- self._generate_blend_file_button.setEnabled(True)
- self._layout.addWidget(self._generate_blend_file_button)
-
- blender_output_warning_label = QLabel(
- "NOTE:\n "
- + "- In Blender, press `Z` and select `Material Preview` to see the videos in the 3D viewport.\n"
- + "- Due to some slop in the way we make the `.blend` file, it will be difficult to retarget a mesh to the resulting armature rig. We're working to improve this output!\n"
- + "- The skeleton will be oriented based on the orientation of `Camera0`, we're working on a method to auto-align with the groundplane."
- )
- blender_output_warning_label.setWordWrap(True)
-
- self._layout.addWidget(blender_output_warning_label)
-
- self._should_pause_playback_bool = False
-
- self._should_pause_playback_bool = False
-
- @property
- def load_session_data_button(self):
- return self._load_session_data_button
-
- @property
- def generate_blend_file_button(self):
- return self._generate_blend_file_button
-
- @property
- def play_button(self):
- return self._play_button
-
- @property
- def pause_button(self):
- return self._pause_button
-
- @property
- def should_pause_playback_bool(self):
- return self._should_pause_playback_bool
-
- @property
- def blender_exe_path_str(self):
- return self._blender_exe_path_str
-
- def _handle_load_session_data_button_clicked(self):
- self._load_session_data_button.setEnabled(False)
- self._play_button.setEnabled(False)
- self._pause_button.setEnabled(True)
-
- def _handle_play_button_clicked(self):
- self._should_pause_playback_bool = False
- self._play_button.setEnabled(False)
- self._pause_button.setEnabled(True)
-
- def _handle_pause_button_clicked(self):
- self._should_pause_playback_bool = True
- self._play_button.setEnabled(True)
- self._pause_button.setEnabled(False)
-
- def _make_blender_path_layout(self):
- blender_path_layout = QVBoxLayout()
-
- self._open_blender_path_file_dialog_button = QPushButton(
- "Locate Blender Executable"
- )
- blender_path_layout.addWidget(self._open_blender_path_file_dialog_button)
- self._open_blender_path_file_dialog_button.clicked.connect(
- self._open_blender_path_file_dialog
- )
- self._open_blender_path_file_dialog_button.setToolTip(
- "This is the path executable that we will send the `blender export` subprocess command"
- )
-
- self._blender_exe_path_str = get_best_guess_of_blender_path()
- if self._blender_exe_path_str is None:
- self._blender_exe_path_str = " - Blender executable not specified - "
- self._current_blender_path_label = QLabel(self._blender_exe_path_str)
- # if self._blender_exe_path is None:
- # self._open_blender_path_file_dialog()
- blender_path_layout.addWidget(self._current_blender_path_label)
-
- return blender_path_layout
-
- def _open_blender_path_file_dialog(self):
- # from this tutorial - https://www.youtube.com/watch?v=gg5TepTc2Jg&t=649s
- self._blender_exe_path_str = QFileDialog.getOpenFileName()
- self._blender_exe_path_str = self._blender_exe_path_str[0]
- logger.info(f"User selected Blender path:{self._blender_exe_path_str}")
- self._current_blender_path_label.setText(self._blender_exe_path_str)
diff --git a/src/gui/main/main_window/left_panel_controls/toolbox_widgets/welcome_tab.py b/src/gui/main/main_window/left_panel_controls/toolbox_widgets/welcome_tab.py
deleted file mode 100644
index e60cbc12..00000000
--- a/src/gui/main/main_window/left_panel_controls/toolbox_widgets/welcome_tab.py
+++ /dev/null
@@ -1,31 +0,0 @@
-from PyQt6.QtWidgets import (
- QWidget,
- QVBoxLayout,
- QPushButton,
-)
-
-
-class SelectWorkflowScreen(QWidget):
- def __init__(self):
- super().__init__()
-
- container_layout = QVBoxLayout()
-
- self._start_new_session_button = QPushButton("&Start New Session")
- container_layout.addWidget(self._start_new_session_button)
-
- self._load_previous_session_button = QPushButton(
- "TO DO - &Load Previous Session"
- )
- self._load_previous_session_button.setEnabled(False)
- container_layout.addWidget(self._load_previous_session_button)
-
- self._import_external_videos = QPushButton("TO DO - &Import External Videos")
- self._import_external_videos.setEnabled(False)
- container_layout.addWidget(self._import_external_videos)
-
- self.setLayout(container_layout)
-
- @property
- def start_new_session_button(self):
- return self._start_new_session_button
diff --git a/src/gui/main/main_window/main_window.py b/src/gui/main/main_window/main_window.py
deleted file mode 100644
index 0062d493..00000000
--- a/src/gui/main/main_window/main_window.py
+++ /dev/null
@@ -1,931 +0,0 @@
-import os
-import shutil
-from pathlib import Path
-from typing import Union
-
-import pandas as pd
-from PyQt6 import QtGui
-from PyQt6.QtGui import QAction
-from PyQt6.QtWidgets import QMainWindow, QSplitter, QFileDialog, QMenuBar, QMenu
-
-from src.blender_stuff.export_to_blender import export_to_blender
-from src.cameras.detection.models import FoundCamerasResponse
-from src.config.home_dir import (
- get_calibration_videos_folder_path,
- get_synchronized_videos_folder_path,
- get_session_folder_path,
- get_session_calibration_toml_file_path,
- get_output_data_folder_path,
- get_most_recent_session_id,
- get_freemocap_data_folder_path,
- get_annotated_videos_folder_path,
- get_skeleton_body_csv_path,
- get_blender_file_path,
- get_raw_data_folder_path,
- PARTIALLY_PROCESSED_DATA_FOLDER_NAME,
- MEDIAPIPE_3D_ORIGIN_ALIGNED_NPY_FILE_NAME,
-)
-from src.core_processes.capture_volume_calibration.charuco_board_detection.dataclasses.charuco_board_definition import (
- CharucoBoardDefinition,
-)
-from src.core_processes.capture_volume_calibration.get_anipose_calibration_object import (
- load_most_recent_anipose_calibration_toml,
- load_calibration_from_session_id,
- load_anipose_calibration_toml_from_path,
-)
-from src.core_processes.mediapipe_stuff.load_mediapipe2d_data import (
- load_mediapipe2d_data,
-)
-from src.core_processes.mediapipe_stuff.load_mediapipe3d_data import (
- load_raw_mediapipe3d_data,
- load_post_processed_mediapipe3d_data,
- load_skeleton_reprojection_error_data,
-)
-from src.core_processes.post_process_skeleton_data.estimate_skeleton_segment_lengths import (
- mediapipe_skeleton_segment_definitions,
- estimate_skeleton_segment_lengths,
- save_skeleton_segment_lengths_to_json,
-)
-
-from src.gui.main.app import get_qt_app
-from src.gui.main.app_state.app_state import APP_STATE
-from src.gui.main.main_window.left_panel_controls.control_panel import ControlPanel
-from src.gui.main.main_window.right_side_panel.right_side_panel import (
- RightSidePanel,
-)
-from src.gui.main.main_window.middle_panel_viewers.session_playback_view.middle_viewing_panel import (
- MiddleViewingPanel,
-)
-
-import logging
-
-from src.gui.main.workers.thread_worker_manager import ThreadWorkerManager
-from src.log.config import LOG_FILE_PATH
-
-from src.sending_anonymous_user_info_to_places.send_pipedream_ping import (
- send_pipedream_ping,
-)
-
-# reboot GUI method based on this - https://stackoverflow.com/a/56563926/14662833
-EXIT_CODE_REBOOT = -123456789
-
-logger = logging.getLogger(__name__)
-
-
-class MainWindow(QMainWindow):
- def __init__(self):
- self._pipedream_ping_dictionary = {"gui_window": "launched"}
- logger.info("Creating main window")
-
- super().__init__()
-
- self.setWindowTitle("freemocap \U0001F480 \U00002728")
- # self._set_icon()
-
- self._main_window_width = int(1920 * 0.9)
- self._main_window_height = int(1080 * 0.8)
- APP_STATE.main_window_height = self._main_window_height
- APP_STATE.main_window_width = self._main_window_width
-
- self.setGeometry(0, 0, self._main_window_width, self._main_window_height)
- self._main_layout = self._create_main_layout()
- self._main_layout.setMaximumHeight(self._main_window_height)
- # left side (control) panel
- self._control_panel = self._create_control_panel()
- self._main_layout.addWidget(self._control_panel.frame)
-
- # middle (viewing) panel
- self._middle_viewing_panel = self._create_middle_viewing_panel()
- self._main_layout.addWidget(self._middle_viewing_panel.frame)
-
- # right side (info) panel
- self._right_side_panel = self._create_right_side_panel()
-
- self._main_layout.addWidget(self._right_side_panel.frame)
-
- self._thread_worker_manager = ThreadWorkerManager(
- session_progress_dictionary=self._pipedream_ping_dictionary
- )
-
- # actions, signals and slots, o my
- self._create_actions()
- self._create_menu_bar()
- self._connect_actions_to_slots()
- self._connect_signals_to_stuff()
- self._connect_buttons_to_stuff()
-
- self._auto_launch_camera_streams = False
- self._auto_process_next_stage = False
- self._cameras_are_popped_out = False
- self._cameras_are_popped_out = False
-
- self._session_id = None
-
- def _create_main_layout(self):
- main_layout = QSplitter()
- # widget = QWidget()
- # widget.setLayout(main_layout)
- self.setCentralWidget(main_layout)
- return main_layout
-
- def _create_control_panel(self):
-
- panel = ControlPanel()
-
- width = self._main_window_width * 0.2
- height = self._main_window_height
- panel.frame.setMinimumHeight(height / 2)
- panel.frame.setMinimumWidth(width / 2)
- size_hint = panel.frame.sizeHint()
- size_hint.setWidth(width)
- size_hint.setHeight(height)
-
- return panel
-
- def _create_middle_viewing_panel(self):
- panel = MiddleViewingPanel()
- width = self._main_window_width * 0.7
- height = self._main_window_height
- panel.frame.setMinimumHeight(height / 2)
- panel.frame.setMinimumWidth(width / 2)
- size_hint = panel.frame.sizeHint()
- size_hint.setWidth(width)
- size_hint.setHeight(height)
-
- return panel
-
- def _create_right_side_panel(self):
- panel = RightSidePanel(
- freemocap_data_folder_path=get_freemocap_data_folder_path()
- )
-
- width = self._main_window_width * 0.1
- height = self._main_window_height
- # panel.frame.setMinimumHeight(height)
- panel.frame.setMinimumWidth(width / 2)
- size_hint = panel.frame.sizeHint()
- size_hint.setWidth(width)
- size_hint.setHeight(height)
-
- return panel
-
- def _create_actions(self):
- # File
- self._new_session_action = QAction("&Start New Session", parent=self)
- self._new_session_action.setShortcut("Ctrl+N")
-
- self._load_most_recent_session_action = QAction(
- "Load &Most Recent Session", parent=self
- )
- self._load_most_recent_session_action.setShortcut("Ctrl+D")
-
- self._load_session_action = QAction("&Load Session...", parent=self)
- self._load_session_action.setShortcut("Ctrl+O")
-
- self._import_videos_action = QAction(
- "Import Synchronized &Videos...", parent=self
- )
- self._import_videos_action.setShortcut("Ctrl+I")
-
- self._reboot_gui_action = QAction("&Reboot GUI", parent=self)
- self._reboot_gui_action.setShortcut("Ctrl+R")
-
- self._exit_action = QAction("E&xit", parent=self)
- self._exit_action.setShortcut("Ctrl+Q")
-
- # Help
- self._open_docs_action = QAction("Open &Documentation", parent=self)
- self._about_us_action = QAction("&About Us", parent=self)
-
- # Navigation
- self._show_camera_control_panel_action = QAction(
- "&1 - Show Camera Control Panel", parent=self
- )
- self._show_camera_control_panel_action.setShortcut("Ctrl+1")
-
- self._show_calibrate_capture_volume_panel_action = QAction(
- "&2 - Show Calibrate Capture Volume Panel", parent=self
- )
- self._show_calibrate_capture_volume_panel_action.setShortcut("Ctrl+2")
-
- self._show_motion_capture_videos_panel_action = QAction(
- "&3 - Show Motion Capture Videos Panel", parent=self
- )
- self._show_motion_capture_videos_panel_action.setShortcut("Ctrl+3")
-
- # Support
- self._donate_action = QAction("&Donate", parent=self)
- self._send_usage_statistics_action = QAction(
- "Send &User Statistics", parent=self
- )
- self._user_survey_action = QAction("&User Survey", parent=self)
-
- def _create_menu_bar(self):
- """
- based mostly on: https://realpython.com/python-menus-toolbars/
- """
- menu_bar = QMenuBar()
- self.setMenuBar(menu_bar)
-
- # file menu
- file_menu = QMenu("&File", parent=menu_bar)
- menu_bar.addMenu(file_menu)
-
- file_menu.addAction(self._new_session_action)
- file_menu.addAction(self._load_most_recent_session_action)
- file_menu.addAction(self._load_session_action)
- file_menu.addAction(self._import_videos_action)
- file_menu.addAction(self._reboot_gui_action)
- file_menu.addAction(self._exit_action)
-
- # navigation menu
- navigation_menu = QMenu("Na&vigation", parent=menu_bar)
- menu_bar.addMenu(navigation_menu)
- navigation_menu.addAction(self._show_camera_control_panel_action)
- navigation_menu.addAction(self._show_calibrate_capture_volume_panel_action)
- navigation_menu.addAction(self._show_motion_capture_videos_panel_action)
-
- # help menu
- help_menu = QMenu("&Help", parent=menu_bar)
- menu_bar.addMenu(help_menu)
- help_menu.setEnabled(False)
-
- help_menu.addAction(self._open_docs_action)
- help_menu.addAction(self._about_us_action)
-
- # support menu
- support_menu = QMenu(
- "\U00002665 &Support the FreeMoCap Project", parent=menu_bar
- )
- support_menu.setEnabled(False)
- menu_bar.addMenu(support_menu)
-
- support_menu.addAction(self._donate_action)
- support_menu.addAction(self._send_usage_statistics_action)
- support_menu.addAction(self._user_survey_action)
-
- return menu_bar
-
- def _connect_actions_to_slots(self):
-
- self._new_session_action.triggered.connect(
- self._middle_viewing_panel.welcome_create_or_load_session_panel.show_new_session_setup_view
- )
-
- self._load_most_recent_session_action.triggered.connect(
- lambda: self._start_session(get_most_recent_session_id())
- )
-
- self._load_session_action.triggered.connect(self._load_session_dialog)
-
- self._import_videos_action.triggered.connect(
- self._middle_viewing_panel.welcome_create_or_load_session_panel.show_import_videos_view
- )
-
- self._reboot_gui_action.triggered.connect(self._reboot_gui)
-
- self._exit_action.triggered.connect(self.close)
-
- # Navigation Menu
-
- self._show_camera_control_panel_action.triggered.connect(
- lambda: self._control_panel.toolbox_widget.setCurrentWidget(
- self._control_panel.camera_setup_control_panel
- )
- )
- self._show_calibrate_capture_volume_panel_action.triggered.connect(
- lambda: self._control_panel.toolbox_widget.setCurrentWidget(
- self._control_panel.calibrate_capture_volume_panel
- )
- )
- self._show_motion_capture_videos_panel_action.triggered.connect(
- lambda: self._control_panel.toolbox_widget.setCurrentWidget(
- self._control_panel.motion_capture_panel
- )
- )
-
- # self._open_docs_action.triggered.connect()
- # self._about_us_action.triggered.connect()
- # self._donate_action.triggered.connect()
- # self._send_usage_statistics_action.triggered.connect()
- # self._user_survey_action.triggered.connect()
-
- def _connect_buttons_to_stuff(self):
- logger.info("Connecting buttons to stuff")
-
- # Welcome Panel
- self._middle_viewing_panel.welcome_create_or_load_session_panel.start_session_button.clicked.connect(
- lambda: self._start_session(
- session_id=self._middle_viewing_panel.welcome_create_or_load_session_panel.session_id_input_string,
- new_session=True,
- )
- )
-
- self._middle_viewing_panel.welcome_create_or_load_session_panel.load_most_recent_session_button.clicked.connect(
- self._load_most_recent_session_action.trigger
- )
-
- self._middle_viewing_panel.welcome_create_or_load_session_panel.load_session_button.clicked.connect(
- self._load_session_action.trigger
- )
-
- self._middle_viewing_panel.welcome_create_or_load_session_panel.synchronized_videos_selection_dialog_button.clicked.connect(
- self._import_videos
- )
-
- # Camera Control Panel
- self._control_panel.camera_setup_control_panel.apply_settings_to_cameras_button.clicked.connect(
- self._apply_settings_and_launch_camera_threads
- )
-
- self._control_panel.camera_setup_control_panel.redetect_cameras_button.clicked.connect(
- self._redetect_cameras
- )
-
- self._control_panel.camera_setup_control_panel.pop_out_cameras_button.clicked.connect(
- self._handle_pop_out_cameras_button_pressed
- )
-
- self._control_panel.camera_setup_control_panel.close_cameras_button.clicked.connect(
- self._middle_viewing_panel.camera_stream_grid_view.close_camera_widgets
- )
-
- # Calibration panel
- self._control_panel.calibrate_capture_volume_panel.start_recording_button.clicked.connect(
- lambda: self._start_recording_videos(
- panel=self._control_panel.calibrate_capture_volume_panel
- )
- )
-
- self._control_panel.calibrate_capture_volume_panel.stop_recording_button.clicked.connect(
- lambda: self._stop_recording_videos(
- panel=self._control_panel.calibrate_capture_volume_panel,
- calibration_videos=True,
- )
- )
-
- self._control_panel.calibrate_capture_volume_panel.calibrate_capture_volume_from_videos_button.clicked.connect(
- self._setup_and_launch_anipose_calibration_thread_worker
- )
-
- # RecordVideos panel
- self._control_panel.motion_capture_panel.start_recording_button.clicked.connect(
- lambda: self._start_recording_videos(
- panel=self._control_panel.motion_capture_panel,
- )
- )
-
- self._control_panel.motion_capture_panel.stop_recording_button.clicked.connect(
- lambda: self._stop_recording_videos(
- panel=self._control_panel.motion_capture_panel
- )
- )
-
- # (record videos) ProcessVideos panel
- self._control_panel.process_session_data_panel.process_all_button.clicked.connect(
- self._fully_process_mocap_videos
- )
-
- self._control_panel.process_session_data_panel.detect_2d_skeletons_button.clicked.connect(
- self._setup_and_launch_mediapipe_2d_detection_thread_worker
- )
-
- self._control_panel.process_session_data_panel.triangulate_3d_data_button.clicked.connect(
- self._setup_and_launch_triangulate_3d_thread_worker
- )
-
- self._control_panel.process_session_data_panel.gap_fill_filter_origin_align_button.clicked.connect(
- self._setup_and_launch_gap_fill_filter_origin_align_thread_worker
- )
-
- self._control_panel.process_session_data_panel.convert_npy_to_csv_button.clicked.connect(
- self._setup_and_launch_convert_npy_to_csv_thread_worker
- )
-
- # Visualize Mocap Data panel
- self._control_panel.visualize_session_data_panel.load_session_data_button.clicked.connect(
- self._visualize_motion_capture_data
- )
- self._control_panel.visualize_session_data_panel.generate_blend_file_button.clicked.connect(
- self._generate_blend_file
- )
-
- self._control_panel.visualize_session_data_panel.generate_blend_file_button.clicked.connect(
- self._open_blender_file
- )
- # (right side) File viewer panel
- self._right_side_panel.file_system_view_widget.show_current_session_folder_button.clicked.connect(
- lambda: self._set_session_folder_as_root_for_file_viewer(self._session_id)
- )
-
- def _connect_signals_to_stuff(self):
- logger.info("Connecting signals to stuff")
-
- self._right_side_panel.file_system_view_widget.load_session_folder_signal.connect(
- self._start_session
- )
-
- self._thread_worker_manager.camera_detection_finished.connect(
- self._handle_found_cameras_response
- )
-
- # self._control_panel.camera_setup_control_panel.camera_parameters_updated_signal.connect(
- # self._apply_settings_and_launch_camera_threads
- # )
-
- self._middle_viewing_panel.camera_stream_grid_view.cameras_connected_signal.connect(
- self._middle_viewing_panel.show_camera_streams
- )
-
- self._thread_worker_manager.videos_saved_signal.connect(
- self._handle_videos_saved_signal
- )
-
- self._thread_worker_manager.start_3d_processing_signal.connect(
- lambda: self._setup_and_launch_triangulate_3d_thread_worker(
- auto_process_next_stage=True
- )
- )
-
- self._thread_worker_manager.start_post_processing_signal.connect(
- lambda: self._setup_and_launch_gap_fill_filter_origin_align_thread_worker(
- auto_process_next_stage=True
- )
- )
-
- self._thread_worker_manager.start_convert_npy_to_to_csv_signal.connect(
- lambda: self._setup_and_launch_convert_npy_to_csv_thread_worker(
- auto_process_next_stage=True
- )
- )
-
- self._thread_worker_manager.start_blender_processing_signal.connect(
- self._generate_blend_file
- )
-
- self._thread_worker_manager.start_session_data_visualization_signal.connect(
- self._visualize_motion_capture_data
- )
-
- def _set_session_folder_as_root_for_file_viewer(self, session_id: str):
- session_path = get_session_folder_path(session_id, create_folder=True)
- self._right_side_panel.file_system_view_widget.set_folder_as_root(session_path)
-
- def _load_session_dialog(self):
- # from this tutorial - https://www.youtube.com/watch?v=gg5TepTc2Jg&t=649s
- user_selected_path = QFileDialog.getExistingDirectory(
- self,
- "Select the session folder you want to load...",
- get_freemocap_data_folder_path(),
- )
-
- self._session_id = str(
- Path(user_selected_path).relative_to(get_freemocap_data_folder_path())
- )
-
- logger.info(
- f"User selected session path:{user_selected_path}, `session_id` set to {self._session_id}"
- )
-
- self._start_session(self._session_id)
-
- def _import_videos(self):
- # from this tutorial - https://www.youtube.com/watch?v=gg5TepTc2Jg&t=649s
- external_videos_path = QFileDialog.getExistingDirectory(
- self,
- "Select a folder containig synchronized videos (each video must have *exactly* the same number of frames)",
- str(Path.home()),
- )
- self._session_id = (
- self._middle_viewing_panel.welcome_create_or_load_session_panel.session_id_input_string
- )
-
- synchronized_videos_folder_path = get_synchronized_videos_folder_path(
- self._session_id, create_folder=True
- )
-
- logger.info(
- f"Copying videos from {external_videos_path} to {synchronized_videos_folder_path}"
- )
-
- for video_path in Path(external_videos_path).glob("*.mp4"):
- shutil.copy(video_path, synchronized_videos_folder_path)
-
- self._start_session(self._session_id)
-
- def _start_session(self, session_id: str, new_session: bool = False):
-
- self._session_id = session_id
- self._control_panel.enable_toolbox_panels()
- self._set_session_folder_as_root_for_file_viewer(self._session_id)
- self._right_side_panel.file_system_view_widget.show_current_session_folder_button.setEnabled(
- True
- )
-
- text = (
- self._right_side_panel.file_system_view_widget.show_current_session_folder_button.text()
- )
- self._right_side_panel.file_system_view_widget.show_current_session_folder_button.setText(
- text + ", session_id: " + self._session_id
- )
-
- if (
- new_session
- and self._middle_viewing_panel.welcome_create_or_load_session_panel.auto_detect_cameras_checkbox.isChecked()
- ):
- self._thread_worker_manager.launch_detect_cameras_worker()
-
- self._show_camera_control_panel_action.trigger()
-
- self._middle_viewing_panel.show_camera_streams()
-
- if (
- new_session
- and self._middle_viewing_panel.welcome_create_or_load_session_panel.auto_connect_to_cameras_checkbox.isChecked()
- ):
- self._auto_launch_camera_streams = True
-
- def _handle_found_cameras_response(
- self, found_cameras_response: FoundCamerasResponse
- ):
- APP_STATE.available_cameras = found_cameras_response.cameras_found_list
- self._control_panel.camera_setup_control_panel.handle_found_cameras_response(
- found_cameras_response
- )
-
- if self._auto_launch_camera_streams:
- self._auto_launch_camera_streams = False
- self._apply_settings_and_launch_camera_threads()
-
- def _redetect_cameras(self):
- try:
- self._middle_viewing_panel.camera_stream_grid_view.close_camera_widgets()
- except Exception as e:
- logger.info(e)
- raise e
- self._thread_worker_manager.launch_detect_cameras_worker()
-
- def _apply_settings_and_launch_camera_threads(
- self, pop_out_camera_windows: bool = False
- ):
- logger.info("Applying settings and launching camera threads")
-
- self._control_panel.camera_setup_control_panel.pop_out_cameras_button.setEnabled(
- True
- )
-
- try:
- self._middle_viewing_panel.camera_stream_grid_view.close_camera_widgets()
- except Exception as e:
- logger.info(e)
- raise e
-
- dictionary_of_webcam_configs = (
- self._control_panel.camera_setup_control_panel.get_webcam_configs_from_parameter_tree()
- )
-
- self._cameras_are_popped_out = pop_out_camera_windows
-
- self._control_panel.camera_setup_control_panel.pop_out_cameras_button.setEnabled(
- not pop_out_camera_windows
- )
- self._control_panel.camera_setup_control_panel.dock_cameras_button.setEnabled(
- pop_out_camera_windows
- )
-
- self._middle_viewing_panel.camera_stream_grid_view.create_and_start_camera_widgets(
- dictionary_of_webcam_configs=dictionary_of_webcam_configs,
- pop_out_camera_windows=pop_out_camera_windows,
- )
-
- def _handle_pop_out_cameras_button_pressed(self):
- logger.info("`Pop out cameras` button pressed.")
- if not self._cameras_are_popped_out:
- self._apply_settings_and_launch_camera_threads(pop_out_camera_windows=True)
- else:
- self._apply_settings_and_launch_camera_threads(pop_out_camera_windows=False)
-
- def _start_recording_videos(self, panel):
- panel.change_button_states_on_record_start()
- self._middle_viewing_panel.camera_stream_grid_view.start_recording_videos()
-
- def _stop_recording_videos(self, panel, calibration_videos=False):
- panel.change_button_states_on_record_stop()
- self._middle_viewing_panel.camera_stream_grid_view.stop_recording_videos()
-
- dictionary_of_video_recorders = (
- self._middle_viewing_panel.camera_stream_grid_view.gather_video_recorders()
- )
-
- if calibration_videos:
- folder_to_save_videos = get_calibration_videos_folder_path(self._session_id)
- else:
- folder_to_save_videos = get_synchronized_videos_folder_path(
- self._session_id
- )
-
- self._thread_worker_manager.launch_save_videos_thread_worker(
- folder_to_save_videos=folder_to_save_videos,
- dictionary_of_video_recorders=dictionary_of_video_recorders,
- calibration_videos=calibration_videos,
- )
-
- def _handle_videos_saved_signal(self, calibration_videos: bool = False):
- self._middle_viewing_panel.camera_stream_grid_view.reset_video_recorders()
-
- if calibration_videos:
- if (
- self._control_panel.calibrate_capture_volume_panel.process_recording_automatically_checkbox.isChecked()
- ):
- self._setup_and_launch_anipose_calibration_thread_worker()
- else: # mocap videos
- if (
- self._control_panel.motion_capture_panel.process_recording_automatically_checkbox.isChecked()
- ):
- self._fully_process_mocap_videos()
-
- def _setup_and_launch_anipose_calibration_thread_worker(self):
- calibration_videos_folder_path = get_calibration_videos_folder_path(
- self._session_id
- )
- if (
- not Path(calibration_videos_folder_path).exists()
- or len(list(Path(calibration_videos_folder_path).glob("*.mp4"))) == 0
- ):
- logger.info(
- f"Calibration videos folder does not exist (or its empty): {calibration_videos_folder_path}, copying vidoes from `synchronized_videos` to `calibration_videos` and trying with that"
- )
- Path(calibration_videos_folder_path).mkdir(parents=True, exist_ok=True)
- shutil.copytree(
- get_synchronized_videos_folder_path(self._session_id),
- calibration_videos_folder_path,
- dirs_exist_ok=True,
- )
-
- charuco_board_definition = self._get_user_specified_charuco_definition()
- logger.info(
- f"Launching Anipose calibration thread worker with the following parameters: {charuco_board_definition.__dict__}"
- )
- self._thread_worker_manager.launch_anipose_calibration_thread_worker(
- charuco_board_definition=charuco_board_definition,
- calibration_videos_folder_path=calibration_videos_folder_path,
- charuco_square_size_mm=self._control_panel.calibrate_capture_volume_panel.charuco_square_size,
- session_id=self._session_id,
- jupyter_console_print_function_callable=self._right_side_panel.jupyter_console_widget.print_to_console,
- )
-
- def _get_user_specified_charuco_definition(self):
- charuco_board_definition = CharucoBoardDefinition()
- user_charuco_selection = (
- self._control_panel.calibrate_capture_volume_panel.charuco_combo_box_selection
- )
-
- if user_charuco_selection == "Default (3x5 squares)":
- charuco_board_definition.number_of_squares_width = 5
- charuco_board_definition.number_of_squares_height = 3
- elif user_charuco_selection == "Pre-Alpha (5x7 squares)":
- charuco_board_definition.number_of_squares_width = 7
- charuco_board_definition.number_of_squares_height = 5
-
- return charuco_board_definition
-
- def _fully_process_mocap_videos(self):
- self._auto_process_next_stage = True
- self._setup_and_launch_mediapipe_2d_detection_thread_worker(
- auto_process_next_stage=True
- )
-
- def _setup_and_launch_mediapipe_2d_detection_thread_worker(
- self, auto_process_next_stage: bool = False
- ):
- synchronized_videos_folder_path = get_synchronized_videos_folder_path(
- self._session_id
- )
- raw_data_folder_path = get_raw_data_folder_path(self._session_id)
- self._thread_worker_manager.launch_detect_2d_skeletons_thread_worker(
- synchronized_videos_folder_path=synchronized_videos_folder_path,
- output_data_folder_path=raw_data_folder_path,
- auto_process_next_stage=auto_process_next_stage,
- )
-
- def _setup_and_launch_triangulate_3d_thread_worker(
- self, auto_process_next_stage: bool = False
- ):
- if (
- self._control_panel.calibrate_capture_volume_panel.use_previous_calibration_box_is_checked
- ):
-
- anipose_calibration_object = load_most_recent_anipose_calibration_toml(
- get_session_folder_path(self._session_id)
- )
-
- calibration_toml_filename = f"camera_calibration_data.toml"
- camera_calibration_toml_path = (
- Path(get_session_folder_path(self._session_id))
- / calibration_toml_filename
- )
- anipose_calibration_object.dump(camera_calibration_toml_path)
-
- elif (
- self._control_panel.calibrate_capture_volume_panel.load_camera_calibration_checkbox_is_checked
- ):
- anipose_calibration_object = load_anipose_calibration_toml_from_path(
- self._control_panel.calibrate_capture_volume_panel.user_selected_calibration_toml_path,
- get_session_folder_path(self._session_id),
- )
- if anipose_calibration_object is None:
- logger.error(
- "Could not load user selected calibration file! Aborting '_setup_and_launch_triangulate_3d_thread_worker'..."
- )
- return
-
- else:
- anipose_calibration_object = load_calibration_from_session_id(
- get_session_calibration_toml_file_path(self._session_id)
- )
-
- raw_data_folder_path = get_raw_data_folder_path(self._session_id)
- mediapipe_2d_data = load_mediapipe2d_data(raw_data_folder_path)
-
- self._thread_worker_manager.launch_triangulate_3d_data_thread_worker(
- anipose_calibration_object=anipose_calibration_object,
- mediapipe_2d_data=mediapipe_2d_data,
- output_data_folder_path=raw_data_folder_path,
- mediapipe_confidence_cutoff_threshold=self._control_panel.process_session_data_panel.mediapipe_confidence_cutoff_threshold,
- auto_process_next_stage=auto_process_next_stage,
- use_triangulate_ransac=self._control_panel.process_session_data_panel.use_triangulate_ransac_checkbox.isChecked(),
- )
-
- def _setup_and_launch_gap_fill_filter_origin_align_thread_worker(
- self, auto_process_next_stage: bool = False
- ):
- output_data_folder_path = Path(get_output_data_folder_path(self._session_id))
-
- skel3d_frame_marker_xyz = load_raw_mediapipe3d_data(output_data_folder_path)
- skeleton_reprojection_error_fr_mar = load_skeleton_reprojection_error_data(
- output_data_folder_path
- )
-
- data_save_path = output_data_folder_path / PARTIALLY_PROCESSED_DATA_FOLDER_NAME
- data_save_path.mkdir(exist_ok=True)
- sampling_rate = 30
- cut_off = 7
- order = 4
- reference_frame_number = None
-
- self._thread_worker_manager.launch_post_process_3d_data_thread_worker(
- skel3d_frame_marker_xyz=skel3d_frame_marker_xyz,
- skeleton_reprojection_error_fr_mar=skeleton_reprojection_error_fr_mar,
- data_save_path=data_save_path,
- sampling_rate=sampling_rate,
- cut_off=cut_off,
- order=order,
- reference_frame_number=reference_frame_number,
- auto_process_next_stage=auto_process_next_stage,
- )
-
- def _setup_and_launch_convert_npy_to_csv_thread_worker(
- self, auto_process_next_stage: bool = False
- ):
- logger.info("Launching convert npy to csv thread worker")
-
- output_data_folder_path = Path(get_output_data_folder_path(self._session_id))
- mediapipe3d_xyz_file_path = (
- Path(output_data_folder_path)
- / PARTIALLY_PROCESSED_DATA_FOLDER_NAME
- / MEDIAPIPE_3D_ORIGIN_ALIGNED_NPY_FILE_NAME
- )
- skel3d_frame_marker_xyz = load_post_processed_mediapipe3d_data(
- mediapipe3d_xyz_file_path
- )
-
- self._thread_worker_manager.launch_convert_npy_to_csv_thread_worker(
- skel3d_frame_marker_xyz=skel3d_frame_marker_xyz,
- output_data_folder_path=output_data_folder_path,
- auto_process_next_stage=auto_process_next_stage,
- )
-
- def _generate_blend_file(self):
- logger.debug(
- "Generating `.blend` file (this will freeze the GUI while it is running, sorry! I tried to calculate_center_of_mass it in a thread instead of a 'subprocess' but I got some kind of permission error when it tried to save the `.blend` file, so.... here we are. Frozen in the GUI. How are you? "
- )
- # self._thread_worker_manager.launch_export_to_blender_thread_worker(
- # get_session_folder_path(self._session_id)
- # )
- path_to_skeleton_body_csv = get_skeleton_body_csv_path(self._session_id)
- skeleton_dataframe = pd.read_csv(path_to_skeleton_body_csv)
-
- skeleton_segment_lengths_dict = estimate_skeleton_segment_lengths(
- skeleton_dataframe=skeleton_dataframe,
- skeleton_segment_definitions=mediapipe_skeleton_segment_definitions,
- )
-
- save_skeleton_segment_lengths_to_json(
- get_output_data_folder_path(self._session_id), skeleton_segment_lengths_dict
- )
-
- blender_file_path = export_to_blender(
- session_folder_path=get_session_folder_path(self._session_id),
- blender_exe_path=self._control_panel.visualize_session_data_panel.blender_exe_path_str,
- )
-
- if (
- self._control_panel.process_session_data_panel.open_in_blender_automatically_checkbox.isChecked()
- ):
- if blender_file_path:
- self._open_blender_file(blender_file_path)
-
- def _open_blender_file(self, blender_file_path: Union[str, Path]):
- logger.info(f"Opening {str(blender_file_path)}")
-
- if blender_file_path is False:
- blender_file_path = get_blender_file_path(self._session_id)
-
- if not Path(blender_file_path).exists():
- logger.error(f"ERROR - {str(blender_file_path)} does not exist!")
- return
-
- os.startfile(str(blender_file_path))
-
- def _visualize_motion_capture_data(self):
- logger.info("Loading data for visualization...")
-
- skeleton_3d_npy = load_post_processed_mediapipe3d_data(
- Path(get_output_data_folder_path(self._session_id))
- / PARTIALLY_PROCESSED_DATA_FOLDER_NAME
- / MEDIAPIPE_3D_ORIGIN_ALIGNED_NPY_FILE_NAME
- )
-
- video_path_iterator = Path(
- get_annotated_videos_folder_path(self._session_id)
- ).glob("*.mp4".lower())
- list_of_video_paths = [str(video_path) for video_path in video_path_iterator]
-
- dictionary_of_video_image_update_callbacks = (
- self._middle_viewing_panel.dictionary_of_video_image_update_callbacks
- )
- self._middle_viewing_panel.show_session_playback_view(
- mediapipe3d_trackedPoint_xyz=skeleton_3d_npy[0, :, :],
- list_of_video_paths=list_of_video_paths,
- )
- self._thread_worker_manager.launch_session_playback_thread(
- frames_per_second=30,
- list_of_video_paths=list_of_video_paths,
- dictionary_of_video_image_update_callbacks=dictionary_of_video_image_update_callbacks,
- skeleton_3d_npy=skeleton_3d_npy,
- update_3d_skeleton_callback=self._middle_viewing_panel.session_playback_view.update_3d_skeleton_callback,
- )
-
- def _reboot_gui(self):
- logger.info("Rebooting GUI... ")
- get_qt_app().exit(EXIT_CODE_REBOOT)
-
- def closeEvent(self, a0: QtGui.QCloseEvent) -> None:
-
- if (
- self._middle_viewing_panel.welcome_create_or_load_session_panel.send_pings_checkbox.isChecked()
- ):
- pipedream_ping_dict = (
- self._thread_worker_manager.session_progress_dictionary
- )
- if Path(get_blender_file_path(self._session_id)).exists():
- pipedream_ping_dict["blender_file_created"] = True
- else:
- pipedream_ping_dict["blender_file_created"] = False
- send_pipedream_ping(pipedream_ping_dict)
-
- logger.info("Close Event detected for main window... ")
- self._middle_viewing_panel.camera_stream_grid_view.close_camera_widgets()
-
- if self._session_id is not None:
- session_folder = get_session_folder_path(self._session_id)
- dir = os.listdir(session_folder)
- if len(dir) == 0:
- logger.info(f"{self._session_id} folder is empty, so let's delete it")
- Path(session_folder).rmdir()
- return
- else:
- try:
- session_log_path = (
- str(
- Path(get_session_folder_path(self._session_id))
- / self._session_id
- )
- + "_log.log"
- )
- logger.info(
- f"Trying to copy log file from {LOG_FILE_PATH} as session log file: {session_log_path}..."
- )
- shutil.copy2(
- LOG_FILE_PATH, get_session_folder_path(self._session_id)
- )
- except Exception as e:
- logger.error(f"Something went wrong copying the log file")
- print(e)
-
- # def _set_icon(self):
- #
- # icon = QtGui.QIcon()
- # logo_path = "assets/logo/freemocap-skelly-logo-black-border-white-bkgd.png"
- # icon.addPixmap(QtGui.QPixmap(logo_path), QtGui.QIcon.Selected, QtGui.QIcon.On)
- # self.setWindowIcon(icon)
diff --git a/src/gui/main/main_window/middle_panel_viewers/__init__.py b/src/gui/main/main_window/middle_panel_viewers/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/gui/main/main_window/middle_panel_viewers/camera_stream_grid_view.py b/src/gui/main/main_window/middle_panel_viewers/camera_stream_grid_view.py
deleted file mode 100644
index 1ea0726b..00000000
--- a/src/gui/main/main_window/middle_panel_viewers/camera_stream_grid_view.py
+++ /dev/null
@@ -1,109 +0,0 @@
-from typing import Dict
-
-import cv2
-from PyQt6 import QtGui
-from PyQt6.QtCore import pyqtSignal
-from PyQt6.QtWidgets import (
- QWidget,
- QVBoxLayout,
- QHBoxLayout,
-)
-
-from src.cameras.webcam_config import WebcamConfig
-from src.gui.main.custom_widgets.single_camera_widget import SingleCameraWidget
-from src.gui.main.qt_utils.clear_layout import clear_layout
-
-import logging
-
-logger = logging.getLogger(__name__)
-
-
-class CameraStreamGridView(QWidget):
- cameras_connected_signal = pyqtSignal()
-
- def __init__(self):
- super().__init__()
-
- self._layout = QVBoxLayout()
- self.setLayout(self._layout)
-
- # for landscape camera streams (e.g. rotate 0 or 180 degrees)
- self._horizontal_layout = QHBoxLayout()
- self._layout.addLayout(self._horizontal_layout)
-
- # for portrait camera streams (e.g. rotate 90 or 270 degrees)
- self._vertical_layout = QVBoxLayout()
- self._layout.addLayout(self._vertical_layout)
-
- def create_and_start_camera_widgets(
- self,
- dictionary_of_webcam_configs=Dict[str, WebcamConfig],
- pop_out_camera_windows: bool = False,
- ):
- logger.info("Creating camera widgets...")
-
- if hasattr(self, "_dictionary_of_camera_widgets"):
- self.close_camera_widgets()
-
- clear_layout(self._horizontal_layout)
- clear_layout(self._vertical_layout)
-
- self._dictionary_of_camera_configs = dictionary_of_webcam_configs
- self._dictionary_of_camera_widgets = {}
-
- for webcam_config in dictionary_of_webcam_configs.values():
- id = str(webcam_config.webcam_id)
- self._dictionary_of_camera_widgets[id] = SingleCameraWidget(webcam_config)
-
- if pop_out_camera_windows:
- self._dictionary_of_camera_widgets[id].setWindowTitle(f"Camera {id}")
- self._dictionary_of_camera_widgets[id].show()
- else:
- if (
- webcam_config.rotate_video_cv2_code == None
- or webcam_config.rotate_video_cv2_code == cv2.ROTATE_180
- ):
- self._vertical_layout.addWidget(
- self._dictionary_of_camera_widgets[id]
- )
- else:
- self._horizontal_layout.addWidget(
- self._dictionary_of_camera_widgets[id]
- )
- self.start_camera_widgets()
-
- def start_camera_widgets(self):
- if hasattr(self, "_dictionary_of_camera_widgets"):
- logger.info("Starting cameras")
- for camera_widget in self._dictionary_of_camera_widgets.values():
- camera_widget.start()
- self.cameras_connected_signal.emit()
-
- def close_camera_widgets(self):
- if hasattr(self, "_dictionary_of_camera_widgets"):
- logger.info("Quitting running cameras")
- for camera_widget in self._dictionary_of_camera_widgets.values():
- camera_widget.quit()
- camera_widget.close()
-
- def start_recording_videos(self):
- for camera_widget in self._dictionary_of_camera_widgets.values():
- camera_widget.start_saving_frames()
-
- def stop_recording_videos(self):
- for camera_widget in self._dictionary_of_camera_widgets.values():
- camera_widget.stop_saving_frames()
-
- def gather_video_recorders(self):
- video_recorders = {}
- for camera_id, camera_widget in self._dictionary_of_camera_widgets.items():
- video_recorders[camera_id] = camera_widget.video_recorder
-
- return video_recorders
-
- def reset_video_recorders(self):
- for camera_widget in self._dictionary_of_camera_widgets.values():
- camera_widget.reset_video_recorder()
-
- def hideEvent(self, a0: QtGui.QHideEvent) -> None:
- self.close_camera_widgets()
diff --git a/src/gui/main/main_window/middle_panel_viewers/session_playback_view/__init__.py b/src/gui/main/main_window/middle_panel_viewers/session_playback_view/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/gui/main/main_window/middle_panel_viewers/session_playback_view/middle_viewing_panel.py b/src/gui/main/main_window/middle_panel_viewers/session_playback_view/middle_viewing_panel.py
deleted file mode 100644
index f201d289..00000000
--- a/src/gui/main/main_window/middle_panel_viewers/session_playback_view/middle_viewing_panel.py
+++ /dev/null
@@ -1,83 +0,0 @@
-from typing import List
-
-import numpy as np
-from PyQt6.QtWidgets import (
- QFrame,
- QVBoxLayout,
- QWidget,
-)
-
-from src.gui.main.main_window.middle_panel_viewers.welcome_view.welcome_create_or_load_new_session_panel import (
- WelcomeCreateOrLoadNewSessionPanel,
-)
-
-from src.gui.main.main_window.middle_panel_viewers.camera_stream_grid_view import (
- CameraStreamGridView,
-)
-from src.gui.main.main_window.middle_panel_viewers.session_playback_view.session_playback_view import (
- SessionPlaybackView,
-)
-
-import logging
-
-logger = logging.getLogger(__name__)
-
-
-class MiddleViewingPanel(QWidget):
- def __init__(self):
- super().__init__()
- self._frame = QFrame()
- self._frame.setFrameShape(QFrame.Shape.StyledPanel)
- self._layout = QVBoxLayout()
- self._frame.setLayout(self._layout)
- self._welcome_create_or_load_session_panel = (
- WelcomeCreateOrLoadNewSessionPanel()
- )
- self._layout.addWidget(self._welcome_create_or_load_session_panel)
-
- self._camera_stream_grid_view = CameraStreamGridView()
- self._camera_stream_grid_view.hide()
-
- self._layout.addWidget(self._camera_stream_grid_view)
-
- self._session_playback_view = SessionPlaybackView()
- self._session_playback_view.hide()
-
- self._layout.addWidget(self._session_playback_view)
-
- @property
- def frame(self):
- return self._frame
-
- @property
- def welcome_create_or_load_session_panel(self):
- return self._welcome_create_or_load_session_panel
-
- @property
- def camera_stream_grid_view(self):
- return self._camera_stream_grid_view
-
- @property
- def session_playback_view(self):
- return self._session_playback_view
-
- @property
- def dictionary_of_video_image_update_callbacks(self):
- return self._session_playback_view.dictionary_of_video_image_update_callbacks
-
- def show_camera_streams(self):
- logger.info("Showing camera stream grid view")
- self._welcome_create_or_load_session_panel.hide()
- self._camera_stream_grid_view.show()
-
- def show_session_playback_view(
- self, list_of_video_paths: List, mediapipe3d_trackedPoint_xyz: np.ndarray
- ):
- self._session_playback_view.initialize_video_playback_grid(
- list_of_video_paths=list_of_video_paths,
- )
- self._session_playback_view.initialize_skeleton_view(
- mediapipe3d_trackedPoint_xyz=mediapipe3d_trackedPoint_xyz
- )
- self._camera_stream_grid_view.hide()
- self._session_playback_view.show()
diff --git a/src/gui/main/main_window/middle_panel_viewers/session_playback_view/session_playback_view.py b/src/gui/main/main_window/middle_panel_viewers/session_playback_view/session_playback_view.py
deleted file mode 100644
index 82a091e2..00000000
--- a/src/gui/main/main_window/middle_panel_viewers/session_playback_view/session_playback_view.py
+++ /dev/null
@@ -1,45 +0,0 @@
-import logging
-from typing import List
-
-import numpy as np
-from PyQt6.QtWidgets import QWidget, QVBoxLayout
-
-from src.gui.main.main_window.middle_panel_viewers.session_playback_view.video_playback_grid_view import (
- VideoPlaybackGridView,
-)
-from src.gui.main.visualize_session.gl_3d_view_port import Gl3dViewPort
-
-logger = logging.getLogger(__name__)
-
-
-class SessionPlaybackView(QWidget):
- def __init__(self):
- super().__init__()
-
- self._layout = QVBoxLayout()
- self.setLayout(self._layout)
-
- self._video_playback_grid_view = VideoPlaybackGridView()
- self._layout.addWidget(self._video_playback_grid_view)
-
- self._gl_3d_view_port_widget = Gl3dViewPort()
- self._layout.addWidget(self._gl_3d_view_port_widget)
-
- @property
- def dictionary_of_video_image_update_callbacks(self):
- return self._video_playback_grid_view.dictionary_video_image_update_callbacks
-
- @property
- def update_3d_skeleton_callback(self):
- return self._gl_3d_view_port_widget.update_mediapipe3d_skeleton
-
- def initialize_video_playback_grid(self, list_of_video_paths: List):
- logger.info("Showing video playback grid")
- self._video_playback_grid_view.create_video_widgets(
- list_of_video_paths=list_of_video_paths
- )
-
- def initialize_skeleton_view(self, mediapipe3d_trackedPoint_xyz: np.ndarray):
- self._gl_3d_view_port_widget.initialize_mediapipe_3d_skeleton(
- mediapipe3d_trackedPoint_xyz=mediapipe3d_trackedPoint_xyz
- )
diff --git a/src/gui/main/main_window/middle_panel_viewers/session_playback_view/video_playback_grid_view.py b/src/gui/main/main_window/middle_panel_viewers/session_playback_view/video_playback_grid_view.py
deleted file mode 100644
index ef9f78d8..00000000
--- a/src/gui/main/main_window/middle_panel_viewers/session_playback_view/video_playback_grid_view.py
+++ /dev/null
@@ -1,53 +0,0 @@
-from pathlib import Path
-from typing import List
-
-from PyQt6.QtWidgets import (
- QWidget,
- QVBoxLayout,
- QLabel,
- QHBoxLayout,
-)
-
-from src.gui.main.custom_widgets.video_player_widget import VideoPlayerWidget
-from src.gui.main.qt_utils.clear_layout import clear_layout
-
-import logging
-
-logger = logging.getLogger(__name__)
-
-
-class VideoPlaybackGridView(QWidget):
- def __init__(self):
- super().__init__()
-
- self._layout = QHBoxLayout()
- self.setLayout(self._layout)
-
- self._dictionary_of_video_widgets = {}
-
- self._dictionary_of_video_image_update_callbacks = {}
-
- @property
- def dictionary_video_image_update_callbacks(self):
- return self._dictionary_of_video_image_update_callbacks
-
- def create_video_widgets(
- self,
- list_of_video_paths: List,
- ):
- clear_layout(self._layout)
- logger.info("Creating video widgets...")
-
- for video_path in list_of_video_paths:
- video_name = Path(video_path).stem
- video_widget = VideoPlayerWidget()
- self._dictionary_of_video_widgets[video_name] = video_widget
-
- video_layout = QVBoxLayout()
- video_layout.addWidget(QLabel(f"{video_name}"))
- video_layout.addWidget(video_widget)
- self._layout.addLayout(video_layout)
-
- self._dictionary_of_video_image_update_callbacks[
- video_name
- ] = video_widget.update_image
diff --git a/src/gui/main/main_window/middle_panel_viewers/welcome_view/__init__.py b/src/gui/main/main_window/middle_panel_viewers/welcome_view/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/gui/main/main_window/middle_panel_viewers/welcome_view/welcome_create_or_load_new_session_panel.py b/src/gui/main/main_window/middle_panel_viewers/welcome_view/welcome_create_or_load_new_session_panel.py
deleted file mode 100644
index ed1ecbd0..00000000
--- a/src/gui/main/main_window/middle_panel_viewers/welcome_view/welcome_create_or_load_new_session_panel.py
+++ /dev/null
@@ -1,197 +0,0 @@
-import logging
-
-from PyQt6 import QtCore
-from PyQt6.QtWidgets import (
- QWidget,
- QVBoxLayout,
- QLabel,
- QLineEdit,
- QFormLayout,
- QPushButton,
- QCheckBox,
-)
-
-from src.config.home_dir import create_default_session_id
-from src.gui.main.qt_utils.clear_layout import clear_layout
-from src.gui.main.qt_utils.hide_all_in_layout import hide_all_in_layout
-from src.gui.main.style_stuff.css_style_sheet import recommended_next_button_style_sheet
-from src.gui.main.style_stuff.styled_widgets.page_title import PageTitle
-
-logger = logging.getLogger(__name__)
-
-
-class WelcomeCreateOrLoadNewSessionPanel(QWidget):
- def __init__(self):
- super().__init__()
-
- self._layout = QVBoxLayout()
- self.setLayout(self._layout)
-
- self._layout.addStretch()
- self._welcome_to_freemocap_title_widget = self._welcome_to_freemocap_title()
- self._layout.addWidget(self._welcome_to_freemocap_title_widget)
-
- self._layout.addStretch()
-
- self._create_new_session_button = QPushButton("Create &New Session (Ctrl+N)")
- self._create_new_session_button.setStyleSheet(
- recommended_next_button_style_sheet
- )
- self._create_new_session_button.clicked.connect(
- self.show_new_session_setup_view
- )
- self._create_new_session_button.setFocus()
- self._layout.addWidget(self._create_new_session_button)
-
- self._load_most_recent_session_button = QPushButton(
- "Load Most &Recent Session (Ctrl+D)",
- )
- self._load_most_recent_session_button.setEnabled(True)
- self._layout.addWidget(self._load_most_recent_session_button)
-
- self._load_session_button = QPushButton(
- "Load Session (Ctrl+O)",
- )
- self._load_session_button.setEnabled(True)
- self._layout.addWidget(self._load_session_button)
-
- self._import_synchronized_videos_button = QPushButton(
- "&Import Synchronized Videos (Ctrl+I)"
- )
- self._import_synchronized_videos_button.setEnabled(True)
- self._import_synchronized_videos_button.setToolTip(
- "Import videos that were recorded and synchronized externally. Each video must have the *exact* same number of frames"
- )
- self._import_synchronized_videos_button.clicked.connect(
- self.show_import_videos_view
- )
- self._layout.addWidget(self._import_synchronized_videos_button)
-
- send_pings_label = QLabel(
- "(being able to show that people are using this thing will help us get funding for this project :D )"
- )
- send_pings_label.setWordWrap(True)
- self._send_pings_checkbox = QCheckBox(
- "Send ping to devs to let us know when you make a new session"
- )
- self._send_pings_checkbox.setChecked(True)
- self._layout.addWidget(self._send_pings_checkbox)
- self._layout.addWidget(send_pings_label)
-
- self._layout.addStretch()
-
- # show this if user selects 'new session' button
- self._session_id_form_layout = self._create_get_session_id_form_layout()
- self._auto_detect_cameras_checkbox = QCheckBox("Automatically detect cameras")
- self._auto_detect_cameras_checkbox.setChecked(True)
-
- self._auto_connect_to_cameras_checkbox = QCheckBox(
- "Automatically connect to cameras"
- )
- self._auto_connect_to_cameras_checkbox.setChecked(True)
-
- self._start_session_button = QPushButton("Start Session \U00002728")
- self._start_session_button.setStyleSheet(recommended_next_button_style_sheet)
-
- # show this if user selects 'import videos' button
- self._synchronize_videos_checkbox = QCheckBox(
- "TODO - Synchronized videos using audio channels"
- )
- self._synchronize_videos_checkbox.setChecked(False)
- self._synchronize_videos_checkbox.setEnabled(False)
-
- self._launch_synchronized_videos_selection_dialog_button = QPushButton(
- "Select set of synchronized videos..."
- )
- self._launch_synchronized_videos_selection_dialog_button.setStyleSheet(
- recommended_next_button_style_sheet
- )
-
- @property
- def create_new_session_button(self):
- return self._create_new_session_button
-
- @property
- def start_session_button(self):
- return self._start_session_button
-
- @property
- def load_most_recent_session_button(self):
- return self._load_most_recent_session_button
-
- @property
- def load_session_button(self):
- return self._load_session_button
-
- @property
- def send_pings_checkbox(self):
- return self._send_pings_checkbox
-
- @property
- def session_id_input_string(self):
- return self._session_input.text()
-
- @property
- def auto_detect_cameras_checkbox(self):
- return self._auto_detect_cameras_checkbox
-
- @property
- def auto_connect_to_cameras_checkbox(self):
- return self._auto_connect_to_cameras_checkbox
-
- @property
- def synchronized_videos_selection_dialog_button(self):
- return self._launch_synchronized_videos_selection_dialog_button
-
- def _welcome_to_freemocap_title(self):
- # TO DO - this shouldn't be part of the `camera_view_panel` - it should be its own thing that gets swapped out on session start
- logger.info("Creating `welcome to freemocap` widget")
- welcome_widget = QWidget()
- layout = QVBoxLayout()
- welcome_widget.setLayout(layout)
-
- session_title_widget = PageTitle(
- "Welcome to FreeMoCap! \n \U00002728 \U0001F480 \U00002728 "
- )
- layout.addWidget(session_title_widget, QtCore.Qt.AlignCenter)
-
- alpha_version_text_str = "This is an *early* version of the `alpha` version of this software, so like - Manage your Expectations lol "
- layout.addWidget(QLabel(alpha_version_text_str), QtCore.Qt.AlignCenter)
-
- return welcome_widget
-
- def _create_session_id_input(self):
- session_text_input = QLineEdit()
- session_text_input.setText(create_default_session_id())
- return session_text_input
-
- def _create_get_session_id_form_layout(self):
- session_id_form_layout = QFormLayout()
- self._session_input = self._create_session_id_input()
- session_id_form_layout.addRow(QLabel("Session Id"), self._session_input)
- return session_id_form_layout
-
- def show_new_session_setup_view(self):
- hide_all_in_layout(self._layout)
- self._layout.addStretch()
- self._layout.addLayout(self._session_id_form_layout)
-
- self._layout.addWidget(self._auto_detect_cameras_checkbox)
-
- self._layout.addWidget(self._auto_connect_to_cameras_checkbox)
- self._layout.addWidget(self._start_session_button)
- self._start_session_button.setFocus()
- self._layout.addStretch()
-
- def show_import_videos_view(self):
- hide_all_in_layout(self._layout)
- self._layout.addStretch()
- self._layout.addWidget(
- QLabel("Create a session folder with external recorded/synchronized videos")
- )
- self._layout.addLayout(self._session_id_form_layout)
-
- self._layout.addWidget(self._synchronize_videos_checkbox)
- self._layout.addWidget(self._launch_synchronized_videos_selection_dialog_button)
- self._launch_synchronized_videos_selection_dialog_button.setFocus()
- self._layout.addStretch()
diff --git a/src/gui/main/main_window/right_side_panel/__init__.py b/src/gui/main/main_window/right_side_panel/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/gui/main/main_window/right_side_panel/file_system_view_widget.py b/src/gui/main/main_window/right_side_panel/file_system_view_widget.py
deleted file mode 100644
index ac3e2b4a..00000000
--- a/src/gui/main/main_window/right_side_panel/file_system_view_widget.py
+++ /dev/null
@@ -1,102 +0,0 @@
-import os
-import sys
-from pathlib import Path
-from typing import Union
-
-from PyQt6.QtCore import Qt, pyqtSignal
-from PyQt6.QtGui import QFileSystemModel
-from PyQt6.QtWidgets import QWidget, QTreeView, QVBoxLayout, QMenu, QPushButton
-from qtpy import QtGui
-
-from src.config.home_dir import get_freemocap_data_folder_path, get_session_folder_path
-from src.gui.main.app_state.app_state import APP_STATE
-
-import logging
-
-logger = logging.getLogger(__name__)
-
-
-class FileSystemViewWidget(QWidget):
- load_session_folder_signal = pyqtSignal(str)
-
- def __init__(self, freemocap_data_folder_path: Union[str, Path]):
- logger.info("Creating FileSystemViewWidget")
- super().__init__()
-
- self._freemocap_data_folder_path = freemocap_data_folder_path
-
- layout = QVBoxLayout()
- self.setLayout(layout)
-
- self.setWindowTitle("File System Viewer")
- # self.setGeometry(300, 300, appWidth, appHeight)
-
- self._file_system_model = QFileSystemModel()
- self._tree_view_widget = QTreeView()
- layout.addWidget(self._tree_view_widget)
-
- self._tree_view_widget.setContextMenuPolicy(Qt.CustomContextMenu)
- self._tree_view_widget.customContextMenuRequested.connect(self._context_menu)
- self._tree_view_widget.doubleClicked.connect(self.open_file)
-
- self._tree_view_widget.setModel(self._file_system_model)
- # self.tree.setColumnWidth(0, 250)
- self._tree_view_widget.setAlternatingRowColors(True)
- self._tree_view_widget.resizeColumnToContents(1)
-
- self.set_folder_view_to_freemocap_data_folder()
-
- self._show_current_session_folder_button = QPushButton(
- "Show Current Session Folder"
- )
- self._show_current_session_folder_button.setEnabled(False)
- layout.addWidget(self._show_current_session_folder_button)
-
- self._reset_folder_view_to_freemocap_data_folder_button = QPushButton(
- "Show FreeMoCap Data folder"
- )
- self._reset_folder_view_to_freemocap_data_folder_button.setEnabled(True)
- self._reset_folder_view_to_freemocap_data_folder_button.clicked.connect(
- self.set_folder_view_to_freemocap_data_folder
- )
- layout.addWidget(self._reset_folder_view_to_freemocap_data_folder_button)
-
- @property
- def show_current_session_folder_button(self):
- return self._show_current_session_folder_button
-
- def set_folder_view_to_freemocap_data_folder(self):
- logger.info(f"Setting root folder to {str(self._freemocap_data_folder_path)}")
- self.set_folder_as_root(self._freemocap_data_folder_path)
-
- def set_folder_as_root(self, folder_path: Union[str, Path]):
- logger.info(f"Setting root folder to {str(folder_path)}")
- self._file_system_model.setRootPath(folder_path)
- self._tree_view_widget.setRootIndex(self._file_system_model.index(folder_path))
-
- def _context_menu(self):
- menu = QMenu()
- open = menu.addAction("Open file")
- open.triggered.connect(self.open_file)
- load_session = menu.addAction("Load session folder")
- load_session.triggered.connect(self.load_session_folder)
-
- cursor = QtGui.QCursor()
- menu.exec_(cursor.pos())
-
- def open_file(self):
- index = self._tree_view_widget.currentIndex()
- file_path = self._file_system_model.filePath(index)
- logger.info(f"Opening file from file_system_view_widget: {file_path}")
- os.startfile(file_path)
-
- def load_session_folder(self):
- index = self._tree_view_widget.currentIndex()
- file_path = Path(self._file_system_model.filePath(index))
- if file_path.is_file():
- file_path = Path(file_path).parent
- session_id = str(file_path.relative_to(self._freemocap_data_folder_path))
-
- logger.info(f"Loading session - {session_id} - from file_system_view_widget")
-
- self.load_session_folder_signal.emit(str(session_id))
diff --git a/src/gui/main/main_window/right_side_panel/jupyter_console_widget.py b/src/gui/main/main_window/right_side_panel/jupyter_console_widget.py
deleted file mode 100644
index 6ac899f2..00000000
--- a/src/gui/main/main_window/right_side_panel/jupyter_console_widget.py
+++ /dev/null
@@ -1,67 +0,0 @@
-from typing import Dict
-
-import numpy as np
-from PyQt6.QtWidgets import QWidget
-from qtconsole.manager import QtKernelManager
-from qtconsole.rich_jupyter_widget import RichJupyterWidget
-
-from src.gui.main.app import get_qt_app
-
-
-def make_jupyter_widget_with_kernel():
- """Start a kernel, connect to it, and create a RichJupyterWidget to use it"""
- kernel_manager = QtKernelManager(kernel_name="python3")
- kernel_manager.start_kernel()
-
- kernel_client = kernel_manager.client()
- kernel_client.start_channels()
-
- jupyter_widget = RichJupyterWidget()
- jupyter_widget.kernel_manager = kernel_manager
- jupyter_widget.kernel_client = kernel_client
- return jupyter_widget
-
-
-class JupyterConsoleWidget(QWidget):
- def __init__(self, dark_mode: bool = True):
- super().__init__()
-
- self._jupyter_widget = self._start_kernel_and_whatnot()
- self._import_stuff()
-
- # get_qt_app().aboutToQuit.connect(self.shutdown_kernel)
-
- if dark_mode:
- self._jupyter_widget.set_default_style("linux")
-
- @property
- def jupyter_widget(self):
- return self._jupyter_widget
-
- def _start_kernel_and_whatnot(self):
- """Start a kernel, connect to it, and create a RichJupyterWidget to use it"""
- kernel_manager = QtKernelManager(kernel_name="python3")
- kernel_manager.start_kernel()
-
- kernel_client = kernel_manager.client()
- kernel_client.start_channels()
-
- jupyter_widget = RichJupyterWidget()
- jupyter_widget.kernel_manager = kernel_manager
- jupyter_widget.kernel_client = kernel_client
- return jupyter_widget
-
- def _import_stuff(self):
- self.execute("import matplotlib.pyplot as plt", hidden=True)
- self.execute("import numpy as np", hidden=True)
- self.execute("%whos")
-
- def execute(self, code: str, hidden: bool = False):
- self._jupyter_widget.execute(code, hidden=hidden)
-
- def print_to_console(self, message: str):
- self.execute(f"print('{message}')")
-
- def shutdown_kernel(self):
- self._jupyter_widget.kernel_client.stop_channels()
- self._jupyter_widget.kernel_manager.shutdown_kernel()
diff --git a/src/gui/main/main_window/right_side_panel/right_side_panel.py b/src/gui/main/main_window/right_side_panel/right_side_panel.py
deleted file mode 100644
index 8f84bb5a..00000000
--- a/src/gui/main/main_window/right_side_panel/right_side_panel.py
+++ /dev/null
@@ -1,62 +0,0 @@
-from pathlib import Path
-from typing import Union
-
-from PyQt6.QtWidgets import QFrame, QVBoxLayout, QTabWidget, QPushButton
-
-from src.gui.main.app import get_qt_app
-from src.gui.main.main_window.right_side_panel.file_system_view_widget import (
- FileSystemViewWidget,
-)
-from src.gui.main.main_window.right_side_panel.jupyter_console_widget import (
- JupyterConsoleWidget,
-)
-
-
-class RightSidePanel(QTabWidget):
- def __init__(self, freemocap_data_folder_path: Union[str, Path]):
- super().__init__()
- self._frame = QFrame()
- self._frame.setFrameShape(QFrame.Shape.StyledPanel)
- self._layout = QVBoxLayout()
- self._frame.setLayout(self._layout)
-
- self._file_viewer_tab_widget = QTabWidget()
- self._layout.addWidget(self._file_viewer_tab_widget)
-
- self._file_system_view_widget = FileSystemViewWidget(
- freemocap_data_folder_path=freemocap_data_folder_path
- )
- self._file_viewer_tab_widget.addTab(
- self._file_system_view_widget, "Motion Capture Sessions"
- )
-
- self._log_and_console_tab_widget = QTabWidget()
- self._layout.addWidget(self._log_and_console_tab_widget)
-
- self._jupyter_console_widget = JupyterConsoleWidget()
- self._log_and_console_tab_widget.addTab(
- self._jupyter_console_widget.jupyter_widget,
- "iPython Jupyter Console",
- )
-
- @property
- def frame(self):
- return self._frame
-
- @property
- def file_system_view_widget(self):
- return self._file_system_view_widget
-
- @property
- def jupyter_console_widget(self):
- return self._jupyter_console_widget
-
- # def _create_jupyter_console_widget(self):
- # # create jupyter console widget
- # jupyter_widget = JupyterConsoleWidget()
- # # get_qt_app().aboutToQuit.connect(jupyter_widget.shutdown_kernel)
- #
- # return jupyter_widget
-
- def _create_log_widget(self):
- pass
diff --git a/src/gui/main/qt_utils/clear_layout.py b/src/gui/main/qt_utils/clear_layout.py
deleted file mode 100644
index c3a35247..00000000
--- a/src/gui/main/qt_utils/clear_layout.py
+++ /dev/null
@@ -1,16 +0,0 @@
-import logging
-
-logger = logging.getLogger(__name__)
-
-
-def clear_layout(layout):
- logger.debug(f"Clearing layout {layout}")
- while layout.count():
- child = layout.takeAt(0)
- if child.widget():
- logger.debug(f"Deleting child widget {child.widget}")
- child.widget().deleteLater()
- elif child.layout():
- clear_layout(child.layout())
- logger.debug(f"Deleting sub-layout {child.layout}")
- child.layout().deleteLater()
diff --git a/src/gui/main/qt_utils/hide_all_in_layout.py b/src/gui/main/qt_utils/hide_all_in_layout.py
deleted file mode 100644
index ec24a38e..00000000
--- a/src/gui/main/qt_utils/hide_all_in_layout.py
+++ /dev/null
@@ -1,16 +0,0 @@
-import logging
-
-logger = logging.getLogger(__name__)
-
-
-def hide_all_in_layout(layout):
- logger.debug(f"Hiding everything in layout {layout}")
- while layout.count():
- child = layout.takeAt(0)
- if child.widget():
- logger.debug(f"Hiding child widget {child.widget}")
- child.widget().hide()
- elif child.layout():
- hide_all_in_layout(child.layout())
- logger.debug(f"Hiding sub-layout {child.layout}")
- child.layout().hide()
diff --git a/src/gui/main/qt_utils/parameter_tree_to_and_from_dictionary.py b/src/gui/main/qt_utils/parameter_tree_to_and_from_dictionary.py
deleted file mode 100644
index 078dc8d3..00000000
--- a/src/gui/main/qt_utils/parameter_tree_to_and_from_dictionary.py
+++ /dev/null
@@ -1,51 +0,0 @@
-from typing import Dict, Any
-
-from pyqtgraph.parametertree import Parameter
-
-
-def create_parameter_tree_from_dictionary(
- dictionary: Dict[str, Any], name: str = "Root"
-) -> Parameter:
- """
- Creates a ParameterTree from a dictionary.
- """
- parameter_tree = Parameter.create(name=name, type="group", children=[])
- for key, value in dictionary.items():
- if isinstance(value, dict):
- parameter_tree.addChild(create_parameter_tree_from_dictionary(value, key))
- else:
- parameter_tree.addChild(Parameter.create(name=key, type="str", value=value))
- return parameter_tree
-
-
-def create_dictionary_from_parameter_tree(parameter_tree: Parameter) -> Dict[str, Any]:
- """
- Creates a dictionary from a ParameterTree.
- """
- dictionary = {}
- for child in parameter_tree.children():
- if isinstance(child, Parameter):
- dictionary[child.name()] = child.value()
- else:
- dictionary[child.name()] = create_dictionary_from_parameter_tree(child)
- return dictionary
-
-
-if __name__ == "__main__":
- import pyqtgraph as pg
- from rich import print
-
- dict_to_tree = {
- "a": 1,
- "b": 2,
- "c": {"d": 3, "e": 4},
- }
-
- tree = create_parameter_tree_from_dictionary(dict_to_tree)
-
- dict_from_tree = create_dictionary_from_parameter_tree(tree)
- print(dict_from_tree)
- tree.show()
-
- app = pg.mkQApp()
- pg.exec()
diff --git a/src/gui/main/qt_utils/set_font_size.py b/src/gui/main/qt_utils/set_font_size.py
deleted file mode 100644
index bcd5e4e9..00000000
--- a/src/gui/main/qt_utils/set_font_size.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from PyQt6.QtWidgets import QLabel
-
-
-def set_font_size(label_widget: QLabel, size: int):
- font = label_widget.font()
- font.setPointSize(size)
- label_widget.setFont(font)
diff --git a/src/gui/main/style_stuff/__init__.py b/src/gui/main/style_stuff/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/gui/main/style_stuff/css_style_sheet.py b/src/gui/main/style_stuff/css_style_sheet.py
deleted file mode 100644
index 5ce8e579..00000000
--- a/src/gui/main/style_stuff/css_style_sheet.py
+++ /dev/null
@@ -1,24 +0,0 @@
-qt_app_css_style_sheet = """
-
- QMainWindow {
- background-color: #3d7072;
- }
-
- QPushButton {
- background-color: #2b4e50;
- color: #ffffff;
- border-radius: 4px;
- font-size: 13px;
- }
- QPushButton:hover {
- background-color: #7b3f60;
- }
- QPushButton:disabled {
- background-color: #6d8587;
- }
-
- """
-
-recommended_next_button_style_sheet = """
- border: 2px solid #d95157;
- """
diff --git a/src/gui/main/style_stuff/set_font_size.py b/src/gui/main/style_stuff/set_font_size.py
deleted file mode 100644
index bcd5e4e9..00000000
--- a/src/gui/main/style_stuff/set_font_size.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from PyQt6.QtWidgets import QLabel
-
-
-def set_font_size(label_widget: QLabel, size: int):
- font = label_widget.font()
- font.setPointSize(size)
- label_widget.setFont(font)
diff --git a/src/gui/main/style_stuff/styled_widgets/__init__.py b/src/gui/main/style_stuff/styled_widgets/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/gui/main/style_stuff/styled_widgets/page_title.py b/src/gui/main/style_stuff/styled_widgets/page_title.py
deleted file mode 100644
index 435cc04a..00000000
--- a/src/gui/main/style_stuff/styled_widgets/page_title.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from PyQt6.QtCore import Qt
-from PyQt6.QtWidgets import QLabel
-
-from src.gui.main.qt_utils.set_font_size import set_font_size
-
-
-class PageTitle(QLabel):
- def __init__(self, *args, **kwargs):
- super().__init__(*args, **kwargs)
- set_font_size(self, 24)
- self.setAlignment(Qt.AlignmentFlag.AlignCenter)
- self.setStyleSheet("padding-bottom: 20px")
diff --git a/src/gui/main/style_stuff/styled_widgets/panel_section_title.py b/src/gui/main/style_stuff/styled_widgets/panel_section_title.py
deleted file mode 100644
index b3f91323..00000000
--- a/src/gui/main/style_stuff/styled_widgets/panel_section_title.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from PyQt6.QtCore import Qt
-from PyQt6.QtWidgets import QLabel
-
-from src.gui.main.qt_utils.set_font_size import set_font_size
-
-
-class PanelSectionTitle(QLabel):
- def __init__(self, *args, **kwargs):
- super().__init__(*args, **kwargs)
- set_font_size(self, 12)
- self.setStyleSheet("weight: bold")
- self.setAlignment(Qt.AlignmentFlag.AlignCenter)
- # self.setStyleSheet("padding-bottom: 5px")
diff --git a/src/gui/main/style_stuff/styled_widgets/primary_button.py b/src/gui/main/style_stuff/styled_widgets/primary_button.py
deleted file mode 100644
index a48003b6..00000000
--- a/src/gui/main/style_stuff/styled_widgets/primary_button.py
+++ /dev/null
@@ -1,33 +0,0 @@
-from PyQt6.QtWidgets import QPushButton
-
-active_primary_button_style_sheet = """
- QPushButton {
- background-color: #336e6d;
- color: #ffffff;
- border-radius: 4px;
- min-height: 24px;
- font-size: 16px;
- }
- """
-
-
-# not_active_primary_button_style_sheet = """
-# QPushButton {
-# background-color: 'lightgrey';
-# color: #ffffff;
-# border-radius: 4px;
-# min-height: 32px;
-# max-width: 160px;
-# font-weight: 400;
-# font-size: 16px;
-# }
-# QPushButton:hover {
-# background-color: 'lightgrey';
-# }
-# """
-
-
-class PrimaryButton(QPushButton):
- def __init__(self, *args, **kwargs):
- super().__init__(*args, **kwargs)
- self.setStyleSheet(active_primary_button_style_sheet)
diff --git a/src/gui/main/tool_tips_and_warning_labels/tool_tips_strings.py b/src/gui/main/tool_tips_and_warning_labels/tool_tips_strings.py
deleted file mode 100644
index c6203f93..00000000
--- a/src/gui/main/tool_tips_and_warning_labels/tool_tips_strings.py
+++ /dev/null
@@ -1 +0,0 @@
-mediapipe_confidence_cutoff_tool_tip_str = "Removes `mediapipe 2d` that has a confidence value less than [this_threshold].\n\n Every tracking algorithm will (should!) give you some measure of confidence - For mediapipe, they call it 'visibility' and it is a number between 0 and 1. NOTE - You should never really trust these `confidence` values completely, especially when neural networks (nn's) are involved. NN's are notorious for assigning very high confidence values to completely bonkers wrong answers (see e.g. Nguyen, Yosinski, and Clune (2015) 'Deep Neural Networks are Easily Fooled'). \n\n In our case, mediapipe will often find ghost skeletons in the background clutter of the scene and assign them high enough confidence that they will pass this threshold, which can wreck the 3d reconstruction. \n\n TO DO- We should really be using a more geometically grouned `reprojection error` based method for filtering. "
diff --git a/src/gui/main/visualize_session/gl_3d_view_port.py b/src/gui/main/visualize_session/gl_3d_view_port.py
deleted file mode 100644
index 8614f843..00000000
--- a/src/gui/main/visualize_session/gl_3d_view_port.py
+++ /dev/null
@@ -1,131 +0,0 @@
-import logging
-from typing import Union
-
-import numpy as np
-import pyqtgraph as pg
-import pyqtgraph.opengl as gl
-from PyQt6.QtWidgets import QWidget, QVBoxLayout
-from pyqtgraph.dockarea.Dock import Dock
-
-from src.core_processes.mediapipe_stuff.mediapipe_skeleton_names_and_connections import (
- mediapipe_body_connections,
-)
-from src.pipelines.session_pipeline.data_classes.data_3d_single_frame_payload import (
- Data3dMultiFramePayload,
-)
-
-logger = logging.getLogger(__name__)
-
-
-class Gl3dViewPort(QWidget):
- def __init__(self):
- logger.info("setting up Visualizer3d")
- super().__init__()
-
- self._base_scalar = 2e3 # 2 meters, probably
- self._frame_number = -1
-
- self._mediapipe_connections_dict = {}
- self._mediapipe_skeleton_scatter_item = None
- self._mediapipe_body_connections = mediapipe_body_connections
-
- self._layout = QVBoxLayout()
- self.setLayout(self._layout)
-
- self._opengl_3d_plot_widget = gl.GLViewWidget()
- self._setup_3d_view(initial_viewing_distance=self._base_scalar)
- self._layout.addWidget(self._opengl_3d_plot_widget)
-
- def _setup_3d_view(self, initial_viewing_distance: Union[float, int] = 2e3):
- self._opengl_3d_plot_widget.opts["distance"] = initial_viewing_distance
- self._opengl_3d_plot_widget.opts["azimuth"] = 90
- self._opengl_3d_plot_widget.opts["elevation"] = 90
-
- self._create_grid_planes(grid_scale=initial_viewing_distance)
- self._create_rgb_origin_axes()
-
- def _create_rgb_origin_axes(self):
- # create XYZ axes
- x_axis_line_array = np.array([[0, 0, 0], [100, 0, 0]])
- y_axis_line_array = np.array([[0, 0, 0], [0, 100, 0]])
- z_axis_line_array = np.array([[0, 0, 0], [0, 0, 100]])
-
- self.origin_x_axis_gl_lineplot_item = pg.opengl.GLLinePlotItem(
- pos=x_axis_line_array, color=(1, 0, 0, 1), width=1.0, antialias=True
- )
- self.origin_y_axis_gl_lineplot_item = pg.opengl.GLLinePlotItem(
- pos=y_axis_line_array, color=(0, 1, 0, 1), width=1.0, antialias=True
- )
- self.origin_z_axis_gl_lineplot_item = pg.opengl.GLLinePlotItem(
- pos=z_axis_line_array, color=(0, 0, 1, 1), width=1.0, antialias=True
- )
- self._opengl_3d_plot_widget.addItem(self.origin_x_axis_gl_lineplot_item)
- self._opengl_3d_plot_widget.addItem(self.origin_y_axis_gl_lineplot_item)
- self._opengl_3d_plot_widget.addItem(self.origin_z_axis_gl_lineplot_item)
-
- def _create_grid_planes(self, grid_scale: Union[int, float] = 2e3):
-
- # create the background grids
- grid_plane_x = gl.GLGridItem()
- grid_plane_x.setSize(grid_scale, grid_scale, grid_scale)
- grid_plane_x.setSpacing(grid_scale / 10, grid_scale / 10, grid_scale / 10)
- grid_plane_x.rotate(90, 0, 1, 0)
- grid_plane_x.translate(-grid_scale, 0, 0)
- self._opengl_3d_plot_widget.addItem(grid_plane_x)
-
- grid_plane_y = gl.GLGridItem()
- grid_plane_y.setSize(grid_scale, grid_scale, grid_scale)
- grid_plane_y.setSpacing(grid_scale / 10, grid_scale / 10, grid_scale / 10)
- grid_plane_y.rotate(90, 1, 0, 0)
- grid_plane_y.translate(0, -grid_scale, 0)
- self._opengl_3d_plot_widget.addItem(grid_plane_y)
-
- grid_plane_z = gl.GLGridItem()
- grid_plane_z.setSize(grid_scale, grid_scale, grid_scale)
- grid_plane_z.setSpacing(grid_scale / 10, grid_scale / 10, grid_scale / 10)
- grid_plane_z.translate(0, 0, -grid_scale)
- self._opengl_3d_plot_widget.addItem(grid_plane_z)
-
- def _initialize_mediapipe_skeleton_dottos(
- self, mediapipe3d_trackedPoint_xyz: np.ndarray
- ):
- self._mediapipe_skeleton_scatter_item = gl.GLScatterPlotItem(
- pos=mediapipe3d_trackedPoint_xyz,
- color=(0, 1, 1, 1),
- size=10,
- pxMode=False,
- )
- self._opengl_3d_plot_widget.addItem(self._mediapipe_skeleton_scatter_item)
-
- def _initialize_mediapipe_skeleton_connections(
- self, mediapipe3d_trackedPoint_xyz: np.ndarray
- ):
- self._skeleton_connections_list = []
- for this_connection in self._mediapipe_body_connections:
- this_skel_line = gl.GLLinePlotItem(
- pos=mediapipe3d_trackedPoint_xyz[this_connection, :]
- )
- self._skeleton_connections_list.append(this_skel_line)
- self._opengl_3d_plot_widget.addItem(this_skel_line)
-
- def initialize_mediapipe_3d_skeleton(
- self, mediapipe3d_trackedPoint_xyz: np.ndarray
- ):
-
- self._initialize_mediapipe_skeleton_dottos(mediapipe3d_trackedPoint_xyz)
- self._initialize_mediapipe_skeleton_connections(mediapipe3d_trackedPoint_xyz)
-
- def update_mediapipe3d_skeleton(self, mediapipe3d_trackedPoint_xyz: np.ndarray):
-
- # update skel dottos
- self._mediapipe_skeleton_scatter_item.setData(
- pos=mediapipe3d_trackedPoint_xyz,
- )
-
- # update skel lines
- for this_skeleton_line_number, this_connection in enumerate(
- self._mediapipe_body_connections
- ):
- self._skeleton_connections_list[this_skeleton_line_number].setData(
- pos=mediapipe3d_trackedPoint_xyz[this_connection, :]
- )
diff --git a/src/gui/main/workers/_minimal_example_thread_worker.py b/src/gui/main/workers/_minimal_example_thread_worker.py
deleted file mode 100644
index bcdd7872..00000000
--- a/src/gui/main/workers/_minimal_example_thread_worker.py
+++ /dev/null
@@ -1,15 +0,0 @@
-from PyQt6.QtCore import QThread, pyqtSignal
-
-from src.cameras.detection.cam_singleton import get_or_create_cams
-from src.cameras.detection.models import FoundCamerasResponse
-
-import logging
-
-logger = logging.getLogger(__name__)
-
-
-class MinimalExampleThreadWorker(QThread):
- finished = pyqtSignal(str)
-
- def run(self):
- self.finished.emit("Done!")
diff --git a/src/gui/main/workers/anipose_calibration_thread_worker.py b/src/gui/main/workers/anipose_calibration_thread_worker.py
deleted file mode 100644
index 1f01b288..00000000
--- a/src/gui/main/workers/anipose_calibration_thread_worker.py
+++ /dev/null
@@ -1,59 +0,0 @@
-import logging
-from pathlib import Path
-from typing import Union
-
-from PyQt6.QtCore import QThread, pyqtSignal
-
-from src.core_processes.capture_volume_calibration.charuco_board_detection.dataclasses.charuco_board_definition import (
- CharucoBoardDefinition,
-)
-from src.core_processes.capture_volume_calibration.run_anipose_capture_volume_calibration import (
- run_anipose_capture_volume_calibration,
-)
-
-logger = logging.getLogger(__name__)
-
-
-class AniposeCalibrationThreadWorker(QThread):
- finished = pyqtSignal()
- in_progress = pyqtSignal(str)
-
- def __init__(
- self,
- charuco_board_definition: CharucoBoardDefinition,
- calibration_videos_folder_path: Union[str, Path],
- charuco_square_size_mm: Union[int, float],
- session_id: str,
- ):
- super().__init__()
- self._charuco_board_definition = charuco_board_definition
- self._charuco_square_size_mm = charuco_square_size_mm
- self._calibration_videos_folder_path = calibration_videos_folder_path
- self._session_id = session_id
-
- def _emit_in_progress_data(self, message: str):
- self.in_progress.emit(message)
-
- def run(self):
- logger.info(
- "Beginning Anipose calibration with Charuco Square Size (mm): {}".format(
- self._charuco_square_size_mm
- )
- )
-
- try:
- run_anipose_capture_volume_calibration(
- charuco_board_definition=self._charuco_board_definition,
- charuco_square_size=self._charuco_square_size_mm,
- calibration_videos_folder_path=self._calibration_videos_folder_path,
- pin_camera_0_to_origin=True,
- progress_callback=self._emit_in_progress_data,
- session_id=self._session_id,
- )
- except:
- logger.error("something failed in the anipose calibration")
- raise Exception
-
- logger.info("Anipose calibration complete")
-
- self.finished.emit()
diff --git a/src/gui/main/workers/cam_charuco_frame_thread_worker.py b/src/gui/main/workers/cam_charuco_frame_thread_worker.py
deleted file mode 100644
index 177a417a..00000000
--- a/src/gui/main/workers/cam_charuco_frame_thread_worker.py
+++ /dev/null
@@ -1,122 +0,0 @@
-import cv2
-from PyQt6.QtCore import QThread, pyqtSignal
-from PyQt6.QtGui import QImage
-
-from src.cameras.capture.dataclasses.frame_payload import FramePayload
-from src.cameras.capture.opencv_camera.opencv_camera import OpenCVCamera
-from src.cameras.persistence.video_writer.video_recorder import VideoRecorder
-from src.cameras.webcam_config import WebcamConfig
-from src.core_processes.capture_volume_calibration.charuco_board_detection.charuco_board_detector import (
- CharucoBoardDetector,
-)
-
-import logging
-
-from src.gui.main.app_state.app_state import APP_STATE
-
-logger = logging.getLogger(__name__)
-
-
-class CamCharucoFrameThreadWorker(QThread):
- image_updated_signal = pyqtSignal(QImage)
- ready_to_save_to_video = pyqtSignal(VideoRecorder)
-
- def __init__(self, webcam_config: WebcamConfig):
- super().__init__()
- self._charuco_board_detector = CharucoBoardDetector()
- self._video_recorder = VideoRecorder()
- self._webcam_config = webcam_config
- self._should_save_frames = False
- self._should_continue = True
- self._saved_frame_list = []
-
- @property
- def should_save_frames(self):
- return self._should_save_frames
-
- @property
- def video_recorder(self):
- return self._video_recorder
-
- @property
- def opencv_camera_is_open(self):
- return self._open_cv_camera.is_open
-
- def start_saving_frames(self):
- self._should_save_frames = True
-
- def stop_saving_frames(self):
- self._should_save_frames = False
-
- def reset_video_recorder(self):
- self._video_recorder = VideoRecorder()
-
- def run(self):
- if hasattr(self, "_open_cv_camera"):
- self._open_cv_camera.release()
-
- open_cv_camera = OpenCVCamera(self._webcam_config)
-
- open_cv_camera.connect()
- open_cv_camera.start_frame_capture_thread()
-
- self._open_cv_camera = open_cv_camera
- self._should_continue = True
- any_frames_recorded = False
- try:
- while open_cv_camera.is_capturing_frames and self._should_continue:
- if not open_cv_camera.new_frame_ready:
- continue
- frame_payload = open_cv_camera.latest_frame
-
- if self._webcam_config.rotate_video_cv2_code is not None:
- rotated_image = cv2.rotate(
- frame_payload.image,
- self._webcam_config.rotate_video_cv2_code,
- )
- frame_payload = FramePayload(
- success=frame_payload.success,
- image=rotated_image,
- timestamp_in_seconds_from_record_start=frame_payload.timestamp_in_seconds_from_record_start,
- timestamp_unix_time_seconds=frame_payload.timestamp_unix_time_seconds,
- frame_number=frame_payload.frame_number,
- webcam_id=frame_payload.webcam_id,
- )
-
- if self._should_save_frames:
- print("saving frame :D")
- self._video_recorder.append_frame_payload_to_list(frame_payload)
-
- charuco_payload = (
- self._charuco_board_detector.detect_charuco_board_in_frame_payload(
- frame_payload
- )
- )
-
- image_to_display = charuco_payload.annotated_image
- image_to_display = cv2.flip(image_to_display, 1)
- image_to_display = cv2.cvtColor(image_to_display, cv2.COLOR_BGR2RGB)
- q_image = QImage(
- image_to_display.data,
- image_to_display.shape[1],
- image_to_display.shape[0],
- QImage.Format.Format_RGB888,
- )
- # TODO - Figure out why this is needed lol
- q_image = q_image.scaledToHeight(
- APP_STATE.main_window_height
- / 1 # np.min([3,len(APP_STATE.available_cameras)])
- )
-
- self.image_updated_signal.emit(q_image)
- finally:
- logger.info(f"Closing Camera {self._open_cv_camera.webcam_id_as_str}")
- self._open_cv_camera.close()
-
- def quit(self):
- self._should_continue = False
- try:
- self._open_cv_camera.close()
- except Exception as e:
- print(e)
- super().quit()
diff --git a/src/gui/main/workers/cam_detection_thread_worker.py b/src/gui/main/workers/cam_detection_thread_worker.py
deleted file mode 100644
index cf4aab85..00000000
--- a/src/gui/main/workers/cam_detection_thread_worker.py
+++ /dev/null
@@ -1,21 +0,0 @@
-from PyQt6.QtCore import QThread, pyqtSignal
-
-from src.cameras.detection.cam_singleton import get_or_create_cams
-from src.cameras.detection.models import FoundCamerasResponse
-
-import logging
-
-logger = logging.getLogger(__name__)
-
-
-class CameraDetectionThreadWorker(QThread):
- finished = pyqtSignal(FoundCamerasResponse)
-
- def __init__(self):
- super().__init__()
-
- def run(self):
- logger.info("Detecting cameras....")
- found_cameras_response = get_or_create_cams(always_create=True)
- logger.info(f"Cameras detected: {found_cameras_response}")
- self.finished.emit(found_cameras_response)
diff --git a/src/gui/main/workers/cam_frame_worker.py b/src/gui/main/workers/cam_frame_worker.py
deleted file mode 100644
index d68cd42d..00000000
--- a/src/gui/main/workers/cam_frame_worker.py
+++ /dev/null
@@ -1,45 +0,0 @@
-import cv2
-from PyQt6.QtCore import QThread, Qt, pyqtSignal
-from PyQt6.QtGui import QImage
-
-from src.cameras.capture.opencv_camera.opencv_camera import OpenCVCamera
-from src.cameras.webcam_config import WebcamConfig
-
-
-class CamFrameWorker(QThread):
- ImageUpdate = pyqtSignal(QImage)
-
- def __init__(self, cam_id=None):
- super().__init__()
- self._cam_id = cam_id
-
- def run(self):
- cam = OpenCVCamera(WebcamConfig(webcam_id=self._cam_id))
- cam.connect()
- cam.start_frame_capture_thread()
- self._cam = cam
- try:
- while cam.is_capturing_frames:
- if not cam.new_frame_ready:
- continue
- payload = cam.latest_frame
-
- image = cv2.flip(payload.image, 1)
- image = cv2.cvtColor(image, cv2.COLOR_BGR2RGB)
- converted_frame = QImage(
- image.data,
- image.shape[1],
- image.shape[0],
- QImage.Format.Format_RGB888,
- )
- converted_frame = converted_frame.scaled(
- 640, 480, Qt.AspectRatioMode.KeepAspectRatio
- )
- self.ImageUpdate.emit(converted_frame)
- finally:
- print("Closing the camera")
- self._cam.close()
-
- def quit(self):
- self._cam.close()
- super().quit()
diff --git a/src/gui/main/workers/convert_npy_to_csv_thread_worker.py b/src/gui/main/workers/convert_npy_to_csv_thread_worker.py
deleted file mode 100644
index e5990f51..00000000
--- a/src/gui/main/workers/convert_npy_to_csv_thread_worker.py
+++ /dev/null
@@ -1,37 +0,0 @@
-from pathlib import Path
-from typing import Union
-
-import numpy as np
-from PyQt6.QtCore import QThread, pyqtSignal
-
-from src.cameras.detection.cam_singleton import get_or_create_cams
-from src.cameras.detection.models import FoundCamerasResponse
-
-import logging
-
-from src.core_processes.mediapipe_stuff.convert_mediapipe_npy_to_csv import (
- convert_mediapipe_npy_to_csv,
-)
-
-logger = logging.getLogger(__name__)
-
-
-class ConvertNpyToCsvThreadWorker(QThread):
- finished = pyqtSignal(str)
-
- def __init__(
- self,
- skel3d_frame_marker_xyz: np.ndarray,
- output_data_folder_path: Union[Path, str],
- ):
- super().__init__()
- self._skel3d_frame_marker_xyz = skel3d_frame_marker_xyz
- self.output_data_folder_path = output_data_folder_path
-
- def run(self):
- convert_mediapipe_npy_to_csv(
- mediapipe_3d_frame_trackedPoint_xyz=self._skel3d_frame_marker_xyz,
- output_data_folder_path=self.output_data_folder_path,
- )
-
- self.finished.emit("Done!")
diff --git a/src/gui/main/workers/export_to_blender_worker.py b/src/gui/main/workers/export_to_blender_worker.py
deleted file mode 100644
index 29ddd401..00000000
--- a/src/gui/main/workers/export_to_blender_worker.py
+++ /dev/null
@@ -1,23 +0,0 @@
-from pathlib import Path
-from typing import Union
-
-from PyQt6.QtCore import QThread, pyqtSignal
-
-import logging
-
-from src.blender_stuff import export_to_blender
-
-logger = logging.getLogger(__name__)
-
-
-class ExportToBlenderThreadWorker(QThread):
- finished = pyqtSignal(str)
-
- def __init__(self, session_folder_path: Union[str, Path]):
- super().__init__()
- self._session_folder_path = session_folder_path
-
- def run(self):
- logger.info("Starting `export_to_blender` thread worker...")
- blender_file_path = export_to_blender(self._session_folder_path)
- self.finished.emit(blender_file_path)
diff --git a/src/gui/main/workers/mediapipe_2d_detection_thread_worker.py b/src/gui/main/workers/mediapipe_2d_detection_thread_worker.py
deleted file mode 100644
index 0a8217e5..00000000
--- a/src/gui/main/workers/mediapipe_2d_detection_thread_worker.py
+++ /dev/null
@@ -1,35 +0,0 @@
-from pathlib import Path
-from typing import Union, List
-
-from PyQt6.QtCore import QThread, pyqtSignal
-
-
-import logging
-
-from src.core_processes.mediapipe_stuff.mediapipe_skeleton_detector import (
- MediaPipeSkeletonDetector,
-)
-
-logger = logging.getLogger(__name__)
-
-
-class Mediapipe2dDetectionThreadWorker(QThread):
- finished = pyqtSignal()
-
- def __init__(
- self,
- path_to_folder_of_videos_to_process: Union[str, Path],
- output_data_folder_path: Union[str, Path],
- ):
- super().__init__()
- self._path_to_folder_of_videos_to_process = path_to_folder_of_videos_to_process
- self._output_data_folder_path = output_data_folder_path
-
- def run(self):
- logger.info(f"Tracking 2D mediapipe skeletons in videos ")
- mediapipe_skeleton_detector = MediaPipeSkeletonDetector()
- mediapipe_skeleton_detector.process_folder_full_of_videos(
- self._path_to_folder_of_videos_to_process, self._output_data_folder_path
- )
-
- self.finished.emit()
diff --git a/src/gui/main/workers/post_process_3d_data_thread_worker.py b/src/gui/main/workers/post_process_3d_data_thread_worker.py
deleted file mode 100644
index 2de38956..00000000
--- a/src/gui/main/workers/post_process_3d_data_thread_worker.py
+++ /dev/null
@@ -1,49 +0,0 @@
-from pathlib import Path
-from typing import Union
-
-import numpy as np
-from PyQt6.QtCore import QThread, pyqtSignal
-
-
-import logging
-
-from src.core_processes.post_process_skeleton_data.gap_fill_filter_and_origin_align_skeleton_data import (
- gap_fill_filter_origin_align_3d_data_and_then_calculate_center_of_mass,
-)
-
-logger = logging.getLogger(__name__)
-
-
-class PostProcess3dDataThreadWorker(QThread):
- finished = pyqtSignal(str)
-
- def __init__(
- self,
- skel3d_frame_marker_xyz: np.ndarray,
- skeleton_reprojection_error_fr_mar: np.ndarray,
- data_save_path: Union[str, Path],
- sampling_rate: int,
- cut_off: float,
- order: int,
- reference_frame_number: int = None,
- ):
- super().__init__()
- self.skel3d_frame_marker_xyz = skel3d_frame_marker_xyz
- self.skeleton_reprojection_error_fr_mar = skeleton_reprojection_error_fr_mar
- self.data_save_path = data_save_path
- self.sample_rate = sampling_rate
- self.cut_off = cut_off
- self.order = order
- self.reference_frame_number = reference_frame_number
-
- def run(self):
- gap_fill_filter_origin_align_3d_data_and_then_calculate_center_of_mass(
- self.skel3d_frame_marker_xyz,
- skeleton_reprojection_error_fr_mar=self.skeleton_reprojection_error_fr_mar,
- path_to_folder_where_we_will_save_this_data=self.data_save_path,
- sampling_rate=self.sample_rate,
- cut_off=self.cut_off,
- order=self.order,
- reference_frame_number=self.reference_frame_number,
- )
- self.finished.emit("Done!")
diff --git a/src/gui/main/workers/save_to_video_thread_worker.py b/src/gui/main/workers/save_to_video_thread_worker.py
deleted file mode 100644
index 5a489468..00000000
--- a/src/gui/main/workers/save_to_video_thread_worker.py
+++ /dev/null
@@ -1,26 +0,0 @@
-import logging
-from pathlib import Path
-from typing import Union, Dict
-
-from PyQt6.QtCore import QThread
-
-from src.cameras.persistence.video_writer.video_recorder import VideoRecorder
-from src.cameras.save_synchronized_videos import save_synchronized_videos
-
-logger = logging.getLogger(__name__)
-
-
-class SaveToVideoThreadWorker(QThread):
- def __init__(
- self,
- dictionary_of_video_recorders: Dict[str, VideoRecorder],
- folder_to_save_videos: Union[str, Path],
- ):
- super().__init__()
- self._dictionary_of_video_recorders = dictionary_of_video_recorders
- self._folder_to_save_videos = folder_to_save_videos
-
- def run(self):
- save_synchronized_videos(
- self._dictionary_of_video_recorders, self._folder_to_save_videos
- )
diff --git a/src/gui/main/workers/session_playback_thread_worker.py b/src/gui/main/workers/session_playback_thread_worker.py
deleted file mode 100644
index fbcfd702..00000000
--- a/src/gui/main/workers/session_playback_thread_worker.py
+++ /dev/null
@@ -1,95 +0,0 @@
-import time
-from pathlib import Path
-from typing import Union, Callable, List, Dict
-
-import cv2
-import numpy as np
-from PyQt6.QtCore import QThread, pyqtSignal, QTimer
-
-from src.cameras.detection.cam_singleton import get_or_create_cams
-from src.cameras.detection.models import FoundCamerasResponse
-
-import logging
-
-logger = logging.getLogger(__name__)
-
-
-class SessionPlaybackThreadWorker(QThread):
- def __init__(
- self,
- frames_per_second: Union[int, float],
- list_of_video_paths: List[Union[str, Path]],
- dictionary_of_video_image_update_callbacks: Dict[str, Callable],
- skeleton_3d_npy: np.ndarray,
- update_3d_skeleton_callback: Callable,
- ):
- super().__init__()
- self._frame_duration = frames_per_second**-1
- self._list_of_video_paths = list_of_video_paths
- self._dictionary_of_video_image_update_callbacks = (
- dictionary_of_video_image_update_callbacks
- )
-
- self._skeleton_3d_frame_trackedPoint_dimension = skeleton_3d_npy
- self._update_3d_skeleton_callback = update_3d_skeleton_callback
-
- self._should_continue = True
-
- def _create_video_capture_dictionary(self):
- video_capture_object_dict = {}
- for video_path in self._list_of_video_paths:
- video_name = Path(video_path).stem
- video_capture_object_dict[video_name] = cv2.VideoCapture(str(video_path))
-
- return video_capture_object_dict
-
- def run(self):
- logger.info(
- f"Starting session_playback_thread_worker with frame_duration set to {self._frame_duration:.4f} seconds"
- )
- self._video_capture_object_dict = self._create_video_capture_dictionary()
- last_update_time = time.perf_counter()
- frame_number = -1
- reset_frame_number = False
-
- number_of_frames = list(self._video_capture_object_dict.values())[0].get(
- cv2.CAP_PROP_FRAME_COUNT
- )
-
- while self._should_continue:
- current_time = time.perf_counter()
-
- if current_time - last_update_time > self._frame_duration:
- last_update_time = current_time
- frame_number += 1
- if frame_number >= number_of_frames:
- frame_number = 0
-
- reset_frame_number = True
- self._update_video_images(frame_number=frame_number)
- self._update_skeleton(frame_number=frame_number)
-
- def _update_video_images(self, frame_number: int):
-
- # update videos
- for (
- video_name,
- video_update,
- ) in self._dictionary_of_video_image_update_callbacks.items():
- if frame_number == 0:
- self._video_capture_object_dict[video_name].set(
- cv2.CAP_PROP_POS_FRAMES, 0
- )
- success, image = self._video_capture_object_dict[video_name].read()
- if not success:
- logger.error(f"Failed to read a frame from video : {video_name}")
- raise Exception
-
- video_update(image)
-
- def _update_skeleton(self, frame_number: int):
-
- this_frame_skeleton_data = self._skeleton_3d_frame_trackedPoint_dimension[
- frame_number, :, :
- ]
- self._update_3d_skeleton_callback(this_frame_skeleton_data)
diff --git a/src/gui/main/workers/thread_worker_manager.py b/src/gui/main/workers/thread_worker_manager.py
deleted file mode 100644
index 46396560..00000000
--- a/src/gui/main/workers/thread_worker_manager.py
+++ /dev/null
@@ -1,235 +0,0 @@
-from pathlib import Path
-from typing import Dict, Union, Callable, List
-
-import numpy as np
-from PyQt6.QtCore import pyqtSignal
-from PyQt6.QtWidgets import QWidget
-from src.cameras.detection.models import FoundCamerasResponse
-from src.cameras.persistence.video_writer.video_recorder import VideoRecorder
-from src.core_processes.capture_volume_calibration.charuco_board_detection.dataclasses.charuco_board_definition import (
- CharucoBoardDefinition,
-)
-
-from src.gui.main.workers.anipose_calibration_thread_worker import (
- AniposeCalibrationThreadWorker,
-)
-from src.gui.main.workers.cam_detection_thread_worker import CameraDetectionThreadWorker
-
-import logging
-
-from src.gui.main.workers.convert_npy_to_csv_thread_worker import (
- ConvertNpyToCsvThreadWorker,
-)
-from src.gui.main.workers.export_to_blender_worker import ExportToBlenderThreadWorker
-from src.gui.main.workers.mediapipe_2d_detection_thread_worker import (
- Mediapipe2dDetectionThreadWorker,
-)
-from src.gui.main.workers.post_process_3d_data_thread_worker import (
- PostProcess3dDataThreadWorker,
-)
-from src.gui.main.workers.save_to_video_thread_worker import SaveToVideoThreadWorker
-from src.gui.main.workers.session_playback_thread_worker import (
- SessionPlaybackThreadWorker,
-)
-from src.gui.main.workers.triangulate_3d_data_thread_worker import (
- Triangulate3dDataThreadWorker,
-)
-
-logger = logging.getLogger(__name__)
-
-
-class ThreadWorkerManager(QWidget):
- """This guy's job is to hold on to the parts of threads that need to be kept alive while they are running"""
-
- camera_detection_finished = pyqtSignal(FoundCamerasResponse)
- videos_saved_signal = pyqtSignal(bool)
- start_3d_processing_signal = pyqtSignal()
- start_post_processing_signal = pyqtSignal()
- start_convert_npy_to_to_csv_signal = pyqtSignal()
- start_session_data_visualization_signal = pyqtSignal()
- start_blender_processing_signal = pyqtSignal()
- blender_file_created_signal = pyqtSignal(str)
-
- def __init__(self, session_progress_dictionary: dict):
- super().__init__()
- self._session_progress_dictionary = session_progress_dictionary
-
- @property
- def session_progress_dictionary(self) -> dict:
- return self._session_progress_dictionary
-
- def launch_detect_cameras_worker(self):
- logger.info("Launching `Camera Detection` thread worker")
-
- self._session_progress_dictionary["camera_detection"] = "launched"
-
- self._camera_detection_thread_worker = CameraDetectionThreadWorker()
- self._camera_detection_thread_worker.finished.connect(
- self.camera_detection_finished.emit
- )
- self._camera_detection_thread_worker.start()
-
- def launch_save_videos_thread_worker(
- self,
- folder_to_save_videos: Union[str, Path],
- dictionary_of_video_recorders: Dict[str, VideoRecorder],
- calibration_videos: bool = False,
- ):
- logger.info("Launching `Save Videos` thread worker...")
-
- if calibration_videos:
- self._session_progress_dictionary["save_calibrate_videos"] = "launched"
- else:
- self._session_progress_dictionary["save_mocap_videos"] = "launched"
-
- self._save_to_video_thread_worker = SaveToVideoThreadWorker(
- dictionary_of_video_recorders=dictionary_of_video_recorders,
- folder_to_save_videos=folder_to_save_videos,
- )
- self._save_to_video_thread_worker.start()
- self._save_to_video_thread_worker.finished.connect(
- lambda: self.videos_saved_signal.emit(calibration_videos)
- )
-
- def launch_anipose_calibration_thread_worker(
- self,
- charuco_board_definition: CharucoBoardDefinition,
- calibration_videos_folder_path: Union[str, Path],
- charuco_square_size_mm: float,
- session_id: str,
- jupyter_console_print_function_callable: Callable,
- ):
- logger.info("Launching `Anipose (Charuco Board) Calibration` thread worker")
- self._session_progress_dictionary["anipose_calibration"] = "launched"
- self._anipose_calibration_worker = AniposeCalibrationThreadWorker(
- charuco_board_definition=charuco_board_definition,
- calibration_videos_folder_path=calibration_videos_folder_path,
- charuco_square_size_mm=charuco_square_size_mm,
- session_id=session_id,
- )
- self._anipose_calibration_worker.start()
- self._anipose_calibration_worker.in_progress.connect(
- jupyter_console_print_function_callable
- )
-
- def launch_detect_2d_skeletons_thread_worker(
- self,
- synchronized_videos_folder_path: Union[str, Path],
- output_data_folder_path: Union[str, Path],
- auto_process_next_stage: bool = True,
- ):
- logger.info("Launching `Detect Mediapipe 2d Skeleton` thread worker...")
- self._session_progress_dictionary["medipipe"] = "launched"
- self._mediapipe_2d_detection_thread_worker = Mediapipe2dDetectionThreadWorker(
- path_to_folder_of_videos_to_process=synchronized_videos_folder_path,
- output_data_folder_path=output_data_folder_path,
- )
-
- if auto_process_next_stage:
- logger.info("Emitting `start_3d_processing_signal`")
- self._mediapipe_2d_detection_thread_worker.finished.connect(
- self.start_3d_processing_signal.emit
- )
- self._mediapipe_2d_detection_thread_worker.start()
-
- def launch_triangulate_3d_data_thread_worker(
- self,
- anipose_calibration_object,
- mediapipe_2d_data: np.ndarray,
- output_data_folder_path: Union[str, Path],
- mediapipe_confidence_cutoff_threshold: float,
- auto_process_next_stage: bool = False,
- use_triangulate_ransac: bool = False,
- ):
- logger.info("Launching `Triangulate 3d Data` thread worker...")
- self._session_progress_dictionary["triangulate"] = "launched"
- self._triangulate_3d_data_thread_worker = Triangulate3dDataThreadWorker(
- anipose_calibration_object=anipose_calibration_object,
- mediapipe_2d_data=mediapipe_2d_data,
- output_data_folder_path=output_data_folder_path,
- mediapipe_confidence_cutoff_threshold=mediapipe_confidence_cutoff_threshold,
- use_triangulate_ransac=use_triangulate_ransac,
- )
-
- self._triangulate_3d_data_thread_worker.start()
-
- if auto_process_next_stage:
- logger.info("Emitting `start_post_processing_signal`")
- self._triangulate_3d_data_thread_worker.finished.connect(
- self.start_post_processing_signal.emit
- )
-
- def launch_post_process_3d_data_thread_worker(
- self,
- skel3d_frame_marker_xyz: np.ndarray,
- skeleton_reprojection_error_fr_mar: np.ndarray,
- data_save_path: Union[str, Path],
- sampling_rate: int,
- cut_off: float,
- order: int,
- reference_frame_number: int = None,
- auto_process_next_stage: bool = False,
- ):
- logger.info("Launching `Post Process 3d Data` thread worker...")
- self._session_progress_dictionary["post_process"] = "launched"
- self._post_process_3d_data_thread_worker = PostProcess3dDataThreadWorker(
- skel3d_frame_marker_xyz=skel3d_frame_marker_xyz,
- skeleton_reprojection_error_fr_mar=skeleton_reprojection_error_fr_mar,
- data_save_path=data_save_path,
- sampling_rate=sampling_rate,
- cut_off=cut_off,
- order=order,
- reference_frame_number=reference_frame_number,
- )
- self._post_process_3d_data_thread_worker.start()
-
- if auto_process_next_stage:
- logger.info("Emitting `convert_to_csv_signal`")
- self._post_process_3d_data_thread_worker.finished.connect(
- self.start_convert_npy_to_to_csv_signal.emit
- )
-
- def launch_convert_npy_to_csv_thread_worker(
- self,
- skel3d_frame_marker_xyz: np.ndarray,
- output_data_folder_path: Union[str, Path],
- auto_process_next_stage: bool = False,
- ):
- logger.info("Launching `Convert Npy to Csv` thread worker...")
- self._session_progress_dictionary["convert_to_csv"] = "launched"
- self._convert_npy_to_csv_thread_worker = ConvertNpyToCsvThreadWorker(
- skel3d_frame_marker_xyz=skel3d_frame_marker_xyz,
- output_data_folder_path=output_data_folder_path,
- )
- self._convert_npy_to_csv_thread_worker.start()
-
- if auto_process_next_stage:
- logger.info("Emitting `start_session_data_visualization_signal`")
- self._convert_npy_to_csv_thread_worker.finished.connect(
- self.start_session_data_visualization_signal.emit
- )
- logger.info("Emitting `start_blender_processing_signal`")
- self._convert_npy_to_csv_thread_worker.finished.connect(
- self.start_blender_processing_signal.emit
- )
-
- def launch_session_playback_thread(
- self,
- frames_per_second: Union[int, float],
- list_of_video_paths: List[Union[str, Path]],
- dictionary_of_video_image_update_callbacks: Dict[str, Callable],
- skeleton_3d_npy: np.ndarray,
- update_3d_skeleton_callback: Callable,
- ):
- logger.info(
- f"Launching `session_playback_thread_worker` with frames_per_second set to {frames_per_second} "
- )
- self._session_progress_dictionary["launch_session_playback"] = "launched"
- self._session_playback_viewer_thread_worker = SessionPlaybackThreadWorker(
- frames_per_second=frames_per_second,
- list_of_video_paths=list_of_video_paths,
- dictionary_of_video_image_update_callbacks=dictionary_of_video_image_update_callbacks,
- skeleton_3d_npy=skeleton_3d_npy,
- update_3d_skeleton_callback=update_3d_skeleton_callback,
- )
- self._session_playback_viewer_thread_worker.start()
diff --git a/src/gui/main/workers/triangulate_3d_data_thread_worker.py b/src/gui/main/workers/triangulate_3d_data_thread_worker.py
deleted file mode 100644
index 81f91cf8..00000000
--- a/src/gui/main/workers/triangulate_3d_data_thread_worker.py
+++ /dev/null
@@ -1,49 +0,0 @@
-from pathlib import Path
-from typing import Union
-
-import numpy as np
-from PyQt6.QtCore import QThread, pyqtSignal
-
-import logging
-
-from src.core_processes.capture_volume_calibration.triangulate_3d_data import (
- triangulate_3d_data,
-)
-
-logger = logging.getLogger(__name__)
-
-
-class Triangulate3dDataThreadWorker(QThread):
- finished = pyqtSignal()
-
- def __init__(
- self,
- anipose_calibration_object,
- mediapipe_2d_data: np.ndarray,
- output_data_folder_path: Union[str, Path],
- mediapipe_confidence_cutoff_threshold: float,
- use_triangulate_ransac: bool = False,
- ):
- super().__init__()
- self._anipose_calibration_object = anipose_calibration_object
- self._mediapipe_2d_data = mediapipe_2d_data
- self._output_data_folder_path = output_data_folder_path
- self._mediapipe_confidence_cutoff_threshold = (
- mediapipe_confidence_cutoff_threshold
- )
- self._use_triangulate_ransac = use_triangulate_ransac
-
- def run(self):
- logger.info(
- f"Triangulating 3d data (i.e. combining 2d skeleton data with camera calibration data to estimate 3d positions of tracked points"
- )
-
- triangulate_3d_data(
- anipose_calibration_object=self._anipose_calibration_object,
- mediapipe_2d_data=self._mediapipe_2d_data,
- output_data_folder_path=self._output_data_folder_path,
- mediapipe_confidence_cutoff_threshold=self._mediapipe_confidence_cutoff_threshold,
- use_triangulate_ransac=self._use_triangulate_ransac,
- )
-
- self.finished.emit()
diff --git a/src/gui/workflow_helper_blurbs/camera_setup_control_panel_help_blurb.py b/src/gui/workflow_helper_blurbs/camera_setup_control_panel_help_blurb.py
deleted file mode 100644
index 0949195b..00000000
--- a/src/gui/workflow_helper_blurbs/camera_setup_control_panel_help_blurb.py
+++ /dev/null
@@ -1 +0,0 @@
-camera_setup_control_panel_help_blurb_str = "Choose which cameras you want to use, adjust the settings so that the images look good. When you're satisfied, go to the 'Calibrate Capture Volume' panel. \n For details click here [link to something]"
diff --git a/src/log/config.py b/src/log/config.py
deleted file mode 100644
index aa057de7..00000000
--- a/src/log/config.py
+++ /dev/null
@@ -1,46 +0,0 @@
-import logging
-import logging.handlers
-import sys
-from logging.config import dictConfig
-
-from src.config.home_dir import get_log_file_path
-
-DEFAULT_LOGGING = {"version": 1, "disable_existing_loggers": False}
-
-LOG_FILE_PATH = None
-
-
-def get_logging_handlers():
- """
- Initialize logging defaults for Project.
- :param logfile_path: logfile used to the logfile
- :type logfile_path: string
- This function does:
- - Assign INFO and DEBUG level to logger file handler and console handler
- """
- dictConfig(DEFAULT_LOGGING)
-
- default_formatter = logging.Formatter(
- "[%(asctime)s.%(msecs)04d] [%(levelname)8s] [%(name)s] [%(funcName)s():%(lineno)s] [PID:%(process)d "
- "TID:%(thread)d] %(message)s",
- "%Y-%m-%d %H:%M:%S",
- )
-
- console_handler = logging.StreamHandler(sys.stdout)
- console_handler.setLevel(logging.DEBUG)
- console_handler.setFormatter(default_formatter)
-
- # Setup File handler (from https://stackoverflow.com/a/24507130/14662833 )
- global LOG_FILE_PATH
- LOG_FILE_PATH = get_log_file_path()
- file_handler = logging.FileHandler(LOG_FILE_PATH)
- file_handler.setFormatter(default_formatter)
- file_handler.setLevel(logging.DEBUG)
-
- return [console_handler, file_handler]
-
-
-def configure_logging():
- handlers = get_logging_handlers()
- logging.getLogger("").handlers.extend(handlers)
- logging.root.setLevel(logging.DEBUG)
diff --git a/src/pipelines/__init__.py b/src/pipelines/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/pipelines/calibration_pipeline/__init__.py b/src/pipelines/calibration_pipeline/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/pipelines/calibration_pipeline/calibration_pipeline_orchestrator.py b/src/pipelines/calibration_pipeline/calibration_pipeline_orchestrator.py
deleted file mode 100644
index 2924520b..00000000
--- a/src/pipelines/calibration_pipeline/calibration_pipeline_orchestrator.py
+++ /dev/null
@@ -1,230 +0,0 @@
-import time
-import logging
-import traceback
-from pathlib import Path
-from typing import Union, Callable
-
-import cv2
-
-from src.cameras.multicam_manager.cv_camera_manager import OpenCVCameraManager
-from src.config.home_dir import (
- create_default_session_id,
- get_session_folder_path,
- get_freemocap_data_folder_path,
- get_session_calibration_toml_file_path,
-)
-from src.core_processes.show_cam_window import show_cam_window
-from src.core_processes.utils.image_fps_writer import write_fps_to_image
-from src.core_processes.capture_volume_calibration.anipose_camera_calibration import (
- freemocap_anipose,
-)
-from src.core_processes.capture_volume_calibration.anipose_camera_calibration import (
- AniposeCameraCalibrator,
-)
-from src.core_processes.capture_volume_calibration.charuco_board_detection.charuco_board_detector import (
- CharucoBoardDetector,
-)
-from src.qt_visualizer_and_gui.qt_visualizer_and_gui import QTVisualizerAndGui
-
-logger = logging.getLogger(__name__)
-
-
-class CalibrationPipelineOrchestrator:
- def __init__(
- self,
- session_id: str = None,
- expected_framerate: Union[int, float] = None,
- ):
-
- if session_id is None:
- self._session_id = create_default_session_id(
- string_tag="calibration"
- ) # create a 'calibration only' session
- else:
- self._session_id = (
- session_id # add calibration folder to "full" session folder
- )
-
- self._calibration_start_time_unix_ns = time.time_ns()
- self._charuco_board_detector = CharucoBoardDetector()
- self._visualizer_gui = None
- self._expected_framerate = expected_framerate
- self._open_cv_camera_manager = OpenCVCameraManager(session_id=self._session_id)
-
- @property
- def session_id(self):
- return self._session_id
-
- @property
- def session_folder_path(self):
- return get_session_folder_path(self._session_id)
-
- def record_videos(
- self,
- show_visualizer_gui=False,
- show_camera_views_in_windows=True,
- save_video_in_frame_loop=False,
- ):
- """open all cameras and start recording, detect charuco boards until the user closes the windows, then send recorded videos to `aniposelib` for processing
- produces `[session_id]_calibration.toml` file that can be used to estiamte 3d trajectorires from synchronized images"""
- with self._open_cv_camera_manager.start_capture_session_all_cams(
- calibration_videos=True,
- ) as connected_cameras_dict:
- timestamp_manager = self._open_cv_camera_manager.timestamp_manager
- try:
- if show_visualizer_gui:
- self._visualizer_gui = QTVisualizerAndGui()
- self._visualizer_gui.setup_and_launch(
- self._open_cv_camera_manager.available_webcam_ids
- )
-
- should_continue = True
- while should_continue:
-
- timestamp_manager.log_new_timestamp_for_main_loop_perf_coutner_ns(
- time.perf_counter_ns()
- )
-
- if not self._open_cv_camera_manager.new_multi_frame_ready():
- continue
-
- this_multi_frame_payload = (
- self._open_cv_camera_manager.latest_multi_frame
- )
-
- for (
- this_webcam_id,
- this_open_cv_camera,
- ) in connected_cameras_dict.items():
-
- this_cam_latest_frame = this_multi_frame_payload.frames_dict[
- this_webcam_id
- ]
-
- if this_cam_latest_frame is None:
- continue
-
- # save frame to video file
- if save_video_in_frame_loop:
- # save this frame straight to the video file (no risk of memory overflow, but can't handle higher numbers of cameras)
- this_open_cv_camera.video_recorder.save_frame_payload_to_video_file(
- this_cam_latest_frame
- )
- else:
- # can handle large numbers of cameras, but will eventually fill up RAM and cause a crash
- this_open_cv_camera.video_recorder.append_frame_payload_to_list(
- this_cam_latest_frame
- )
-
- # detect charuco board
- this_charuco_frame_payload = self._charuco_board_detector.detect_charuco_board_in_frame_payload(
- this_cam_latest_frame
- )
-
- if show_camera_views_in_windows:
- should_continue = show_cam_window(
- this_webcam_id,
- this_charuco_frame_payload.annotated_image,
- timestamp_manager,
- )
-
- if show_visualizer_gui:
- write_fps_to_image(
- this_charuco_frame_payload.annotated_image,
- timestamp_manager.median_frames_per_second_for_webcam(
- this_webcam_id
- ),
- )
- self._visualizer_gui.update_camera_view_image(
- this_webcam_id,
- this_charuco_frame_payload.annotated_image,
- )
-
- # exit loop when user presses ESC key
- exit_key = cv2.waitKey(1)
- if exit_key == 27:
- logger.info("ESC has been pressed.")
- should_continue = False
-
- except:
- logger.error("Printing traceback")
- traceback.print_exc()
- finally:
- if show_camera_views_in_windows:
- # logger.info(f"Destroy window {this_open_cv_camera.webcam_id_as_str}")
- # cv2.destroyWindow(this_open_cv_camera.webcam_id_as_str)
- cv2.destroyAllWindows()
- for this_open_cv_camera in connected_cameras_dict.values():
- if not save_video_in_frame_loop:
- this_open_cv_camera.video_recorder.save_list_of_frames_to_video_file(
- this_open_cv_camera.video_recorder.frame_list
- )
- this_open_cv_camera.video_recorder.close()
-
- if show_visualizer_gui:
- self._visualizer_gui.close()
-
- def run_anipose_camera_calibration(
- self,
- charuco_square_size: Union[int, float] = 1,
- pin_camera_0_to_origin: bool = False,
- progress_callback: Callable[[str], None] = None,
- ):
- anipose_camera_calibrator = AniposeCameraCalibrator(
- self.session_id,
- self._charuco_board_detector.charuco_board_data_class_object,
- charuco_square_size=charuco_square_size,
- )
- progress_callback("Endurance is great wow wow wow")
- return anipose_camera_calibrator.calibrate_camera_capture_volume(
- pin_camera_0_to_origin=pin_camera_0_to_origin
- )
-
- def load_most_recent_calibration(self):
- last_successful_calibration_path = Path(
- get_freemocap_data_folder_path(), "last_successful_calibration.toml"
- )
- logger.info(
- f"loading `most recent calibration from:{str(last_successful_calibration_path)}"
- )
- return freemocap_anipose.CameraGroup.load(str(last_successful_calibration_path))
-
- def load_calibration_from_session_id(self, session_id: str):
- session_calibration_file_path = get_session_calibration_toml_file_path(
- session_id
- )
- logger.info(
- f"loading camera calibration file from:{str(session_calibration_file_path)}"
- )
- if Path(session_calibration_file_path).is_file():
- return freemocap_anipose.CameraGroup.load(
- str(session_calibration_file_path)
- )
-
- return self.load_most_recent_calibration()
-
-
-if __name__ == "__main__":
- print("running `calibration_pipeline` as a `__main__` file")
-
- record_new = True
- if record_new:
- session_id = create_default_session_id("calibration")
- session_path = Path(get_session_folder_path(session_id))
- logger.info(
- f"Creating `calibration only` session folder at: {str(session_path)}"
- )
- session_path.mkdir(parents=True, exist_ok=False)
-
- calibration_orchestrator = CalibrationPipelineOrchestrator(session_id)
- calibration_orchestrator.record_videos(
- show_visualizer_gui=False,
- save_video_in_frame_loop=False,
- show_camera_views_in_windows=True,
- )
-
- else:
- session_id = "session_06-05-2022-10_31_34_calibration"
- calibration_orchestrator = CalibrationPipelineOrchestrator(session_id)
-
- calibration_orchestrator.run_anipose_camera_calibration(charuco_square_size=39)
diff --git a/src/pipelines/session_pipeline/__init__.py b/src/pipelines/session_pipeline/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/pipelines/session_pipeline/data_classes/data3d_full_session_data.py b/src/pipelines/session_pipeline/data_classes/data3d_full_session_data.py
deleted file mode 100644
index 5435d3ea..00000000
--- a/src/pipelines/session_pipeline/data_classes/data3d_full_session_data.py
+++ /dev/null
@@ -1,15 +0,0 @@
-from ctypes import Union
-
-import numpy as np
-from pydantic import BaseModel
-
-
-class TweakedModel(BaseModel):
- class Config:
- arbitrary_types_allowed = True
-
-
-class Data3dFullSessionPayload(TweakedModel):
- has_data: bool = (True,)
- data3d_numFrames_numTrackedPoints_XYZ: np.ndarray = None
- data3d_numFrames_numTrackedPoint_reprojectionError: np.ndarray = None
diff --git a/src/pipelines/session_pipeline/data_classes/data_3d_single_frame_payload.py b/src/pipelines/session_pipeline/data_classes/data_3d_single_frame_payload.py
deleted file mode 100644
index e8388045..00000000
--- a/src/pipelines/session_pipeline/data_classes/data_3d_single_frame_payload.py
+++ /dev/null
@@ -1,15 +0,0 @@
-from ctypes import Union
-
-import numpy as np
-from pydantic import BaseModel
-
-
-class TweakedModel(BaseModel):
- class Config:
- arbitrary_types_allowed = True
-
-
-class Data3dMultiFramePayload(TweakedModel):
- has_data: bool = (True,)
- data3d_trackedPointNum_xyz: np.ndarray = None
- data3d_trackedPointNum_reprojectionError: np.ndarray = None
diff --git a/src/pipelines/session_pipeline/data_classes/multi_frame_payload.py b/src/pipelines/session_pipeline/data_classes/multi_frame_payload.py
deleted file mode 100644
index f6ca2d71..00000000
--- a/src/pipelines/session_pipeline/data_classes/multi_frame_payload.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from typing import NamedTuple, Union, Dict, List
-
-import numpy as np
-
-from src.cameras.capture.dataclasses.frame_payload import FramePayload
-
-
-class MultiFramePayload(NamedTuple):
- frames_dict: Dict[str, FramePayload]
- multi_frame_number: int
- each_frame_timestamp: List[Union[int, float]]
- multi_frame_timestamp_seconds: Union[int, float]
diff --git a/src/pipelines/session_pipeline/session_pipeline_orchestrator.py b/src/pipelines/session_pipeline/session_pipeline_orchestrator.py
deleted file mode 100644
index 4c43e414..00000000
--- a/src/pipelines/session_pipeline/session_pipeline_orchestrator.py
+++ /dev/null
@@ -1,671 +0,0 @@
-import logging
-import time
-import traceback
-from pathlib import Path
-from typing import Dict, Union
-
-import cv2
-import numpy as np
-
-from src.config.data_paths import freemocap_data_path
-from src.config.home_dir import (
- create_session_folder,
- create_default_session_id,
- get_most_recent_session_id,
- get_output_data_folder_path,
-)
-from src.core_processes.mediapipe_stuff.mediapipe_skeleton_detector import (
- MediaPipeSkeletonDetector,
- Mediapipe2dDataPayload,
-)
-from src.core_processes.show_cam_window import show_cam_window
-from src.core_processes.utils.image_fps_writer import write_fps_to_image
-from src.pipelines.calibration_pipeline.calibration_pipeline_orchestrator import (
- CalibrationPipelineOrchestrator,
-)
-from src.core_processes.capture_volume_calibration.charuco_board_detection.charuco_board_detector import (
- CharucoBoardDetector,
-)
-from src.pipelines.session_pipeline.data_classes.data3d_full_session_data import (
- Data3dFullSessionPayload,
-)
-from src.pipelines.session_pipeline.data_classes.data_3d_single_frame_payload import (
- Data3dMultiFramePayload,
-)
-from src.qt_visualizer_and_gui.qt_visualizer_and_gui import QTVisualizerAndGui
-
-logger = logging.getLogger(__name__)
-
-
-def get_canonical_time_str():
- return time.strftime("%m-%d-%Y-%H_%M_%S")
-
-
-class SessionPipelineOrchestrator:
- def __init__(
- self, session_id: str = None, expected_framerate: Union[int, float] = None
- ):
-
- if session_id is not None:
- self._session_id = session_id
- else:
- self._session_id = create_default_session_id()
-
- self._expected_framerate = expected_framerate
-
- self._visualizer_gui = QTVisualizerAndGui()
- self._open_cv_camera_manager = None
- self._charuco_board_detector = CharucoBoardDetector()
- self._mediapipe_skeleton_detector = MediaPipeSkeletonDetector(self._session_id)
-
- @property
- def session_id(self):
- return self._session_id
-
- @property
- def expected_framerate(self):
- return self._expected_framerate
-
- @property
- def anipose_camera_calibration_object(self):
- return self._anipose_camera_calibration_object
-
- @anipose_camera_calibration_object.setter
- def anipose_camera_calibration_object(self, anipose_camera_calibration_object):
- self._anipose_camera_calibration_object = anipose_camera_calibration_object
-
- @property
- def mediapipe2d_numCams_numFrames_numTrackedPoints_XY(self):
- return self._mediapipe2d_numCams_numFrames_numTrackedPoints_XY
-
- @mediapipe2d_numCams_numFrames_numTrackedPoints_XY.setter
- def mediapipe2d_numCams_numFrames_numTrackedPoints_XY(
- self, mediapipe2d_numCams_numFrames_numTrackedPoints_XY: np.ndarray
- ):
- self._mediapipe2d_numCams_numFrames_numTrackedPoints_XY = (
- mediapipe2d_numCams_numFrames_numTrackedPoints_XY
- )
-
- @property
- def session_folder_path(self):
- return freemocap_data_path / self._session_id
-
- def calibrate_camera_capture_volume(
- self,
- use_most_recent_calibration: bool = False,
- load_calibration_from_session_id: str = None,
- charuco_square_size: int = 1,
- pin_camera_0_to_origin: bool = False,
- ):
-
- if use_most_recent_calibration:
- self._anipose_camera_calibration_object = (
- CalibrationPipelineOrchestrator().load_most_recent_calibration()
- )
- return
- elif load_calibration_from_session_id is not None:
- calibration_orchestrator = CalibrationPipelineOrchestrator(
- load_calibration_from_session_id
- )
- else: # create new calibration
- calibration_orchestrator = CalibrationPipelineOrchestrator(
- self.session_id, expected_framerate=self.expected_framerate
- )
- calibration_orchestrator.record_videos(
- show_visualizer_gui=False,
- save_video_in_frame_loop=False,
- show_camera_views_in_windows=True,
- )
-
- self._anipose_camera_calibration_object = (
- calibration_orchestrator.run_anipose_camera_calibration(
- charuco_square_size=charuco_square_size,
- pin_camera_0_to_origin=pin_camera_0_to_origin,
- )
- )
-
- def record_new_session(
- self,
- show_visualizer_gui=True,
- show_camera_views_in_windows=False,
- detect_mediapipe=False,
- detect_charuco=True,
- reconstruct_3d=True,
- save_video=True,
- ):
- if reconstruct_3d:
- try:
- self.anipose_camera_calibration_object = (
- CalibrationPipelineOrchestrator().load_calibration_from_session_id(
- self.session_id
- )
- )
- except:
- logger.info(
- f"No calibration found for session_id: {self.session_id}, loading most recent "
- f"calibration"
- )
- self.anipose_camera_calibration_object = (
- CalibrationPipelineOrchestrator().load_most_recent_calibration()
- )
-
- dictionary_of_charuco_frame_payloads_on_this_multi_frame = {}
- dictionary_of_mediapipe_payloads_on_this_multi_frame = {}
-
- with self._open_cv_camera_manager.start_capture_session_all_cams() as connected_cameras_dict:
-
- self._number_of_cameras = len(connected_cameras_dict)
-
- timestamp_manager = self._open_cv_camera_manager.timestamp_manager
-
- try:
- if show_visualizer_gui:
- self._visualizer_gui.setup_and_launch(
- self._open_cv_camera_manager.available_webcam_ids
- )
-
- should_continue = True
- while should_continue: # BIG FRAME LOOP STARTS HERE
-
- if reconstruct_3d:
- if detect_charuco:
- if (
- len(
- dictionary_of_charuco_frame_payloads_on_this_multi_frame
- )
- > 0
- ):
- charuco3d_multi_frame_payload = self._reconstruct_3d_charuco(
- dictionary_of_charuco_frame_payloads_on_this_multi_frame
- )
- if (
- show_visualizer_gui
- and charuco3d_multi_frame_payload is not None
- ):
- self._visualizer_gui.update_charuco_3d_dottos(
- charuco3d_multi_frame_payload
- )
- dictionary_of_charuco_frame_payloads_on_this_multi_frame = (
- {}
- )
-
- if detect_mediapipe:
- if (
- len(
- dictionary_of_mediapipe_payloads_on_this_multi_frame
- )
- > 0
- ):
- mediapipe3d_multi_frame_payload = self._reconstruct_3d_mediapipe(
- dictionary_of_mediapipe_payloads_on_this_multi_frame
- )
- if (
- show_visualizer_gui
- and mediapipe3d_multi_frame_payload is not None
- ):
- self._visualizer_gui.update_mediapipe3d_skeleton(
- mediapipe3d_multi_frame_payload
- )
- dictionary_of_mediapipe_payloads_on_this_multi_frame = (
- {}
- )
-
- timestamp_manager.log_new_timestamp_for_main_loop_perf_coutner_ns(
- time.perf_counter_ns()
- )
-
- if not self._open_cv_camera_manager.new_multi_frame_ready():
- continue
-
- this_multi_frame_payload = (
- self._open_cv_camera_manager.latest_multi_frame
- )
-
- if this_multi_frame_payload is None:
- continue
-
- for (
- this_webcam_id,
- this_open_cv_camera,
- ) in connected_cameras_dict.items():
-
- this_cam_latest_frame = this_multi_frame_payload.frames_dict[
- this_webcam_id
- ]
-
- if this_cam_latest_frame is None:
- continue
-
- image_to_display = this_cam_latest_frame.image.copy()
-
- if save_video:
- create_session_folder(self.session_id)
- print(
- f"Recording: {this_open_cv_camera.webcam_id_as_str}, "
- f"Frame# {this_open_cv_camera.latest_frame_number}"
- )
- # # save this frame straight to the video file (no risk of memory
- # overflow, but can't handle higher numbers of cameras)
- # this_open_cv_camera.video_recorder.save_frame_to_video_file(
- # this_cam_latest_frame)
-
- # can handle large numbers of cameras, but will eventually fill up
- # RAM and cause a crash
- this_open_cv_camera.video_recorder.append_frame_payload_to_list(
- this_cam_latest_frame
- )
-
- if detect_charuco:
- # detect charuco board
- this_charuco_frame_payload = self._charuco_board_detector.detect_charuco_board_in_frame_payload(
- this_cam_latest_frame
- )
- image_to_display = (
- this_charuco_frame_payload.annotated_image
- )
-
- if reconstruct_3d:
- dictionary_of_charuco_frame_payloads_on_this_multi_frame[
- this_webcam_id
- ] = this_charuco_frame_payload
-
- if detect_mediapipe:
- # detect mediapipe skeleton
- this_mediapipe_frame_payload = self._mediapipe_skeleton_detector.detect_skeleton_in_image(
- raw_frame_payload=this_cam_latest_frame,
- annotated_image=image_to_display,
- )
- image_to_display = (
- this_mediapipe_frame_payload.annotated_image
- )
-
- if reconstruct_3d:
- dictionary_of_mediapipe_payloads_on_this_multi_frame[
- this_webcam_id
- ] = this_mediapipe_frame_payload
-
- if show_camera_views_in_windows:
- should_continue = show_cam_window(
- this_webcam_id, image_to_display, timestamp_manager
- )
-
- if show_visualizer_gui:
- write_fps_to_image(
- image_to_display,
- timestamp_manager.median_frames_per_second_for_webcam(
- this_webcam_id
- ),
- )
- self._visualizer_gui.update_camera_view_image(
- this_webcam_id, image_to_display
- )
-
- if show_camera_views_in_windows:
- should_continue = show_cam_window(
- this_webcam_id, image_to_display, timestamp_manager
- )
-
- if show_visualizer_gui:
- write_fps_to_image(
- image_to_display,
- timestamp_manager.median_frames_per_second_for_webcam(
- this_webcam_id
- ),
- )
- self._visualizer_gui.update_camera_view_image(
- this_webcam_id, image_to_display
- )
- # self._visualizer_gui.update_timestamp_plots(timestamp_manager)
-
- if self._visualizer_gui.shut_it_down:
- logger.info("GUI closed.")
- should_continue = False
-
- # save frames if 'record' button is pressed
- this_open_cv_camera.record_frames(
- self._visualizer_gui.record_button_pressed
- )
-
- # exit loop when user presses ESC key
- exit_key = cv2.waitKey(1)
- if exit_key == 27:
- logger.info("ESC has been pressed.")
- should_continue = False
-
- except:
- logger.error("Printing traceback")
- traceback.print_exc()
- finally:
- for this_open_cv_camera in connected_cameras_dict.values():
- this_open_cv_camera.video_recorder.save_list_of_frames_to_video_file(
- this_open_cv_camera.frame_list
- )
-
- if show_camera_views_in_windows:
- logger.info(
- f"Destroy window {this_open_cv_camera.webcam_id_as_str}"
- )
- cv2.destroyWindow(this_open_cv_camera.webcam_id_as_str)
-
- if show_visualizer_gui:
- self._visualizer_gui.close()
-
- timestamp_manager.create_diagnostic_plots()
-
- def _reconstruct_3d_charuco(
- self, dictionary_of_charuco_payloads_on_this_multiframe
- ) -> Union[None, Data3dMultiFramePayload]:
-
- is_there_any_charuco_data = []
- for (
- this_cam_charuco_data
- ) in dictionary_of_charuco_payloads_on_this_multiframe.values():
- is_there_any_charuco_data.append(
- this_cam_charuco_data.charuco_view_data.some_charuco_corners_found
- )
-
- min_cameras_to_reconstruct = 2
- if (
- sum(is_there_any_charuco_data) >= min_cameras_to_reconstruct
- ): # if at least 2 cameras
- # have any data, then we can try to make some 3d dottos
- charuco2d_data_per_cam_dict = self._format_charuco2d_data(
- dictionary_of_charuco_payloads_on_this_multiframe
- )
- charuco_3d_data_payload = self._triangulate_2d_data(
- charuco2d_data_per_cam_dict,
- self._charuco_board_detector.number_of_charuco_corners,
- )
-
- x = charuco_3d_data_payload.data3d_trackedPointNum_xyz[:, 0]
- return charuco_3d_data_payload
-
- def _format_charuco2d_data(
- self, dictionary_of_charuco_payloads_on_this_multiframe
- ) -> Dict:
-
- number_of_tracked_points = (
- self._charuco_board_detector.number_of_charuco_corners
- )
-
- base_charuco_data_npy_with_nans_for_missing_data_xy = np.zeros(
- (number_of_tracked_points, 2)
- )
- base_charuco_data_npy_with_nans_for_missing_data_xy[:] = np.nan
-
- charuco2d_data_per_cam_dict = {}
-
- for this_cam_data in dictionary_of_charuco_payloads_on_this_multiframe.values():
- this_frame_charuco_data_xy = (
- base_charuco_data_npy_with_nans_for_missing_data_xy.copy()
- )
-
- charuco_ids_in_this_frame_idx = this_cam_data.charuco_view_data.charuco_ids
- charuco_corners_in_this_frame_xy = (
- this_cam_data.charuco_view_data.charuco_corners
- )
- if charuco_ids_in_this_frame_idx.__class__ != list:
- this_frame_charuco_data_xy[
- charuco_ids_in_this_frame_idx, :
- ] = charuco_corners_in_this_frame_xy
-
- this_webcam_id = this_cam_data.raw_frame_payload.webcam_id
- charuco2d_data_per_cam_dict[this_webcam_id] = this_frame_charuco_data_xy
-
- return charuco2d_data_per_cam_dict
-
- def _reconstruct_3d_mediapipe(
- self, dictionary_of_mediapipe_payloads_on_this_multi_frame
- ) -> Union[None, Data3dMultiFramePayload]:
- is_there_any_mediapipe_data = []
- for (
- this_cam_medipipe_data
- ) in dictionary_of_mediapipe_payloads_on_this_multi_frame.values():
- is_there_any_mediapipe_data.append(
- this_cam_medipipe_data.pixel_data_numpy_arrays.has_data
- )
-
- min_cameras_to_reconstruct = 2
- if (
- sum(is_there_any_mediapipe_data) >= min_cameras_to_reconstruct
- ): # if at least 2 cameras
- # have any data, then we can try to make some 3d dottos
- mediapipe2d_data_per_cam_dict = {}
- for (
- this_webcam_id,
- this_mediapipe_payload,
- ) in dictionary_of_mediapipe_payloads_on_this_multi_frame.items():
- self._threshold_2d_data_by_confidence(
- this_mediapipe_payload.pixel_data_numpy_arrays, 0.5
- )
-
- mediapipe2d_data_per_cam_dict[
- this_webcam_id
- ] = (
- this_mediapipe_payload.pixel_data_numpy_arrays.all_data2d_nFrames_nTrackedPts_XY
- )
-
- mediapipe_3d_data_payload = self._triangulate_2d_data(
- mediapipe2d_data_per_cam_dict,
- self._mediapipe_skeleton_detector.number_of_tracked_points_total,
- )
-
- return mediapipe_3d_data_payload
-
- def _triangulate_2d_data(
- self, data2d_per_cam_dict: Dict, number_of_tracked_points: int
- ) -> Data3dMultiFramePayload:
-
- each_cam2d_data_list = [
- this_cam_charuco2d_frame_xy
- for this_cam_charuco2d_frame_xy in data2d_per_cam_dict.values()
- ]
-
- data2d_camNum_trackedPointNum_xy = np.asarray(each_cam2d_data_list)
-
- # THIS IS WHERE THE MAGIC HAPPENS - 2d data from calibrated, synchronized cameras has now
- # become a 3d estimate. Hurray! :`D
-
- # simple triangulation
- data3d_trackedPointNum_xyz = (
- self._anipose_camera_calibration_object.triangulate(
- data2d_camNum_trackedPointNum_xy, progress=False, undistort=True
- )
- )
-
- # # triangulation with ransac (to find the best combo of cameras to minimize reprojection
- # error, I think?
- # data3d_trackedPointNum_xyz = self._anipose_camera_calibration_object.triangulate_ransac(
- # data2d_camNum_trackedPointNum_xy,
- # progress=False,
- # undistort=True)
-
- # Reprojection error is a measure of the quality of the reconstruction. It is the
- # distance (error) between the original 2d point and a reprojection of the 3d point back
- # onto the image plane.
- # TODO - use this for filtering data (i.e. if one view has very high reprojection error,
- # re-do the triangulation without that camera's view data)
- # TODO - we are currently using each tracking method's `confidence` values (or whatever
- # they choose to call it) for thresholding, but it's problematic because of the
- # neural_networks' propensity to apply high confidence to bonkers estimates, which leads
- # to SPOOKY GHOST SKELETONS! :O
- data3d_trackedPointNum_reprojectionError = (
- self._anipose_camera_calibration_object.reprojection_error(
- data3d_trackedPointNum_xyz, data2d_camNum_trackedPointNum_xy, mean=True
- )
- )
-
- return Data3dMultiFramePayload(
- has_data=True,
- data3d_trackedPointNum_xyz=data3d_trackedPointNum_xyz,
- data3d_trackedPointNum_reprojectionError=data3d_trackedPointNum_reprojectionError,
- )
-
- def mediapipe_track_skeletons_offline(self):
- self._mediapipe2d_numCams_numFrames_numTrackedPoints_XY = (
- self._mediapipe_skeleton_detector.process_session_folder(
- save_annotated_videos=True
- )
- )
-
- def reconstruct3d_from_2d_data_offline(self):
- number_of_cameras = (
- self._mediapipe2d_numCams_numFrames_numTrackedPoints_XY.shape[0]
- )
- number_of_frames = (
- self._mediapipe2d_numCams_numFrames_numTrackedPoints_XY.shape[1]
- )
- number_of_tracked_points = (
- self._mediapipe2d_numCams_numFrames_numTrackedPoints_XY.shape[2]
- )
- number_of_spatial_dimensions = (
- self._mediapipe2d_numCams_numFrames_numTrackedPoints_XY.shape[3]
- )
-
- if not number_of_spatial_dimensions == 2:
- logger.error(
- f"This is supposed to be 2D data but, number_of_spatial_dimensio"
- f"ns: {number_of_spatial_dimensions}"
- )
- raise Exception
-
- # reshape data to collapse across 'frames' so it becomes [number_of_cameras,
- # number_of_2d_points(numFrames*numPoints), XY]
- data2d_flat = self._mediapipe2d_numCams_numFrames_numTrackedPoints_XY.reshape(
- number_of_cameras, -1, 2
- )
-
- logger.info(
- f"Reconstructing 3d points from 2d points with shape: "
- f"number_of_cameras: {number_of_cameras},"
- f" number_of_frames: {number_of_frames}, "
- f" number_of_tracked_points: {number_of_tracked_points},"
- f" number_of_spatial_dimensions: {number_of_spatial_dimensions}"
- )
-
- data3d_flat = self.anipose_camera_calibration_object.triangulate(
- data2d_flat, progress=True
- )
-
- data3d_reprojectionError_flat = (
- self.anipose_camera_calibration_object.reprojection_error(
- data3d_flat, data2d_flat, mean=True
- )
- )
-
- data3d_numFrames_numTrackedPoints_XYZ = data3d_flat.reshape(
- number_of_frames, number_of_tracked_points, 3
- )
- data3d_numFrames_numTrackedPoints_reprojectionError = (
- data3d_reprojectionError_flat.reshape(
- number_of_frames, number_of_tracked_points
- )
- )
-
- path_to_3d_data_npy = self._save_mediapipe3d_data_to_npy(
- data3d_numFrames_numTrackedPoints_XYZ,
- data3d_numFrames_numTrackedPoints_reprojectionError,
- )
-
- self._mediapipe3d_full_session_payload = Data3dFullSessionPayload(
- data3d_numFrames_numTrackedPoints_XYZ=data3d_numFrames_numTrackedPoints_XYZ,
- data3d_numFrames_numTrackedPoint_reprojectionError=data3d_numFrames_numTrackedPoints_reprojectionError,
- )
-
- return path_to_3d_data_npy
-
- def _save_mediapipe3d_data_to_npy(
- self,
- data3d_numFrames_numTrackedPoints_XYZ: np.ndarray,
- data3d_numFrames_numTrackedPoints_reprojectionError: np.ndarray,
- ):
- output_data_folder = Path(get_output_data_folder_path(self._session_id))
-
- # save spatial XYZ data
- self._mediapipe_3dData_save_path = (
- output_data_folder
- / "mediapipe_3dData_numFrames_numTrackedPoints_spatialXYZ.npy"
- )
- logger.info(f"saving: {self._mediapipe_3dData_save_path}")
- np.save(
- str(self._mediapipe_3dData_save_path), data3d_numFrames_numTrackedPoints_XYZ
- )
-
- # save reprojection error
- self._mediapipe_reprojection_error_save_path = (
- output_data_folder
- / "mediapipe_3dData_numFrames_numTrackedPoints_reprojectionError.npy"
- )
- logger.info(f"saving: {self._mediapipe_reprojection_error_save_path}")
- np.save(
- str(self._mediapipe_reprojection_error_save_path),
- data3d_numFrames_numTrackedPoints_reprojectionError,
- )
-
- return str(self._mediapipe_3dData_save_path)
-
- def _threshold_2d_data_by_confidence(
- self,
- mediapipe2d_data_payload: Mediapipe2dDataPayload,
- confidence_threshold: float,
- ):
- pass
-
-
-def load_mediapipe3d_skeleton_data(session_id: str = None):
- if session_id is None:
- session_id = get_most_recent_session_id()
- output_data_folder = Path(get_output_data_folder_path(session_id))
- mediapipe3d_xyz_file_path = (
- output_data_folder
- / "mediapipe_3dData_numFrames_numTrackedPoints_spatialXYZ.npy"
- )
- logger.info(f"loading: {mediapipe3d_xyz_file_path}")
- mediapipe3d_skeleton_nFrames_nTrajectories_xyz = np.load(
- str(mediapipe3d_xyz_file_path)
- )
-
- mediapipe_reprojection_error_file_path = (
- output_data_folder
- / "mediapipe_3dData_numFrames_numTrackedPoints_reprojectionError.npy"
- )
- logger.info(f"loading: {mediapipe_reprojection_error_file_path}")
- mediapipe3d_skeleton_nFrames_nTrajectories_reprojectionError = np.load(
- str(mediapipe_reprojection_error_file_path)
- )
-
- return Data3dFullSessionPayload(
- data3d_numFrames_numTrackedPoints_XYZ=mediapipe3d_skeleton_nFrames_nTrajectories_xyz,
- data3d_numFrames_numTrackedPoint_reprojectionError=mediapipe3d_skeleton_nFrames_nTrajectories_reprojectionError,
- )
-
-
-if __name__ == "__main__":
- print("running `session_pipeline_orchestrator` as `__main__")
-
- length_of_one_edge_of_a_black_square_on_the_charuco_board_in_mm = 39
- expected_framerate = 25
-
- calibrate_cameras = True
-
- this_session_orchestrator = SessionPipelineOrchestrator(
- expected_framerate=expected_framerate
- )
-
- if calibrate_cameras:
- this_session_orchestrator.calibrate_camera_capture_volume(
- charuco_square_size=length_of_one_edge_of_a_black_square_on_the_charuco_board_in_mm,
- pin_camera_0_to_origin=True,
- )
-
- this_session_orchestrator.record_new_session()
-
- this_session_orchestrator.mediapipe_track_skeletons_offline()
-
- this_session_orchestrator.reconstruct3d_from_2d_data_offline()
-
- # this_session_orchestrator.visualize_session_data_offline()
- #
- # qt_gl_laser_skeleton = QtGlLaserSkeletonVisualizer(
- # mediapipe_skel_fr_mar_xyz=this_session_orchestrator._mediapipe3d_full_session_payload.data3d_numFrames_numTrackedPoints_XYZ)
- # qt_gl_laser_skeleton.start_animation()
diff --git a/src/pupil_labs_stuff/__init__.py b/src/pupil_labs_stuff/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/pupil_labs_stuff/data_classes/__init__.py b/src/pupil_labs_stuff/data_classes/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/pupil_labs_stuff/data_classes/freemocap_session_data_class.py b/src/pupil_labs_stuff/data_classes/freemocap_session_data_class.py
deleted file mode 100644
index 1bd7e0b0..00000000
--- a/src/pupil_labs_stuff/data_classes/freemocap_session_data_class.py
+++ /dev/null
@@ -1,25 +0,0 @@
-from dataclasses import dataclass
-from typing import List
-
-import numpy as np
-
-from jon_scratch.pupil_calibration_pipeline.data_classes.pupil_dataclass_and_handler import (
- PupilLabsDataClass,
-)
-from jon_scratch.pupil_calibration_pipeline.data_classes.rotation_data_class import (
- RotationDataClass,
-)
-
-
-@dataclass
-class FreemocapSessionDataClass:
- session_id: str = None
- timestamps: np.ndarray = None
- mediapipe_skel_fr_mar_dim: np.ndarray = None
- right_eye_pupil_labs_data: PupilLabsDataClass = None
- left_eye_pupil_labs_data: PupilLabsDataClass = None
- head_rotation_data: RotationDataClass = None
- right_eye_socket_rotation_data: RotationDataClass = None
- left_eye_socket_rotation_data: RotationDataClass = None
- right_gaze_vector_endpoint_fr_xyz: np.ndarray = None
- left_gaze_vector_endpoint_fr_xyz: np.ndarray = None
diff --git a/src/pupil_labs_stuff/data_classes/pupil_dataclass_and_handler.py b/src/pupil_labs_stuff/data_classes/pupil_dataclass_and_handler.py
deleted file mode 100644
index 8f2d7d68..00000000
--- a/src/pupil_labs_stuff/data_classes/pupil_dataclass_and_handler.py
+++ /dev/null
@@ -1,103 +0,0 @@
-from dataclasses import dataclass
-from pathlib import Path
-from typing import Union
-
-import numpy as np
-import pandas as pd
-
-
-@dataclass
-class PupilLabsDataClass:
- def __init__(
- self,
- timestamps=None,
- theta=None,
- phi=None,
- pupil_center_normal_x=None,
- pupil_center_normal_y=None,
- pupil_center_normal_z=None,
- eye_d=None,
- method=None,
- ):
- self.timestamps = timestamps
- self.theta = theta
- self.phi = phi
- self.pupil_center_normal_x = pupil_center_normal_x
- self.pupil_center_normal_y = pupil_center_normal_y
- self.pupil_center_normal_z = pupil_center_normal_z
- self.eye_d = eye_d
- self.method = method
-
-
-class PupilDataHandler:
- """
- Class for handling data from Pupil Labs eye tracker
- """
-
- def __init__(self, pupil_dataframe: pd.DataFrame = None):
- if pupil_dataframe is not None:
- self.load_from_dataframe(pupil_dataframe)
-
- def load_from_file(self, file_path: Union[str, Path]):
- pupil_dataframe = pd.read_csv(file_path)
- self.load_from_dataframe(pupil_dataframe)
-
- def load_from_dataframe(self, pupil_dataframe: pd.DataFrame):
- pupil_dataframe = pupil_dataframe
-
- # resituate pupil data so that the pupil normal direction is situated on the origin (instead of the arbitrary eye-camera-based eyeball sphere center)
- # ... I think... I need to check this. Their docs are a bit unclear about the origin of the pupil normal direction.
- # pupil_center_normal_x = np.array(pupil_dataframe['sphere_center_x']) - np.array(pupil_dataframe['circle_3d_normal_x'])
- # pupil_center_normal_y = np.array(pupil_dataframe['sphere_center_y']) - np.array(pupil_dataframe['circle_3d_normal_y'])
- # pupil_center_normal_z = np.array(pupil_dataframe['sphere_center_z']) - np.array(pupil_dataframe['circle_3d_normal_z'])
- pupil_center_normal_x = np.array(pupil_dataframe["circle_3d_normal_x"])
- pupil_center_normal_y = np.array(pupil_dataframe["circle_3d_normal_y"])
- pupil_center_normal_z = np.array(pupil_dataframe["circle_3d_normal_z"])
-
- self.pupil_data = PupilLabsDataClass(
- timestamps=np.array(pupil_dataframe["pupil_timestamp"]),
- theta=np.array(pupil_dataframe["theta"]),
- phi=np.array(pupil_dataframe["phi"]),
- pupil_center_normal_x=pupil_center_normal_x,
- pupil_center_normal_y=pupil_center_normal_y,
- pupil_center_normal_z=pupil_center_normal_z,
- eye_d=pupil_dataframe["eye_id"],
- method=pupil_dataframe["method"],
- )
-
- def convert_to_unix_timestamps(self, pupil_recording_info_json: dict):
- self.pupil_data.timestamps = (
- self.pupil_data.timestamps
- - pupil_recording_info_json["start_time_synced_s"]
- + pupil_recording_info_json["start_time_system_s"]
- )
-
- def get_eye_data(self, eye_str: str):
- """
- get data for the right eye
-
- pull out data according to `eye_d` (right_eye == 0, left_eye==1) and tracking method (because pupil interleaves 2d and 3d data)
- """
- if eye_str == "right":
- eye_d = 0
-
- if eye_str == "left":
- eye_d = 1
-
- this_eye_logical_indicies = np.logical_and(
- self.pupil_data.eye_d == eye_d, self.pupil_data.method != "2d c++"
- )
- return PupilLabsDataClass(
- timestamps=self.pupil_data.timestamps[this_eye_logical_indicies],
- theta=self.pupil_data.theta[this_eye_logical_indicies],
- phi=self.pupil_data.phi[this_eye_logical_indicies],
- pupil_center_normal_x=self.pupil_data.pupil_center_normal_x[
- this_eye_logical_indicies
- ],
- pupil_center_normal_y=self.pupil_data.pupil_center_normal_y[
- this_eye_logical_indicies
- ],
- pupil_center_normal_z=self.pupil_data.pupil_center_normal_z[
- this_eye_logical_indicies
- ],
- )
diff --git a/src/pupil_labs_stuff/data_classes/rotation_data_class.py b/src/pupil_labs_stuff/data_classes/rotation_data_class.py
deleted file mode 100644
index a8d64f54..00000000
--- a/src/pupil_labs_stuff/data_classes/rotation_data_class.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from dataclasses import dataclass
-from typing import List
-
-import numpy as np
-
-
-@dataclass
-class RotationDataClass:
- rotation_matricies: List[np.ndarray]
- local_origin_fr_xyz: np.ndarray = np.array([0, 0, 0])
- x_hat_norm_fr_xyz: np.ndarray = np.array([1, 0, 0])
- y_hat_norm_fr_xyz: np.ndarray = np.array([0, 1, 0])
- z_hat_norm_fr_xyz: np.ndarray = np.array([0, 0, 1])
diff --git a/src/pupil_labs_stuff/load_pupil_data_blender_script.py b/src/pupil_labs_stuff/load_pupil_data_blender_script.py
deleted file mode 100644
index 7c00bf9c..00000000
--- a/src/pupil_labs_stuff/load_pupil_data_blender_script.py
+++ /dev/null
@@ -1,92 +0,0 @@
-import bpy
-import numpy as np
-import sys
-from pathlib import Path
-
-print("loading gaze data as empties")
-
-
-def load_gaze_data(gaze_fr_xyz: np.ndarray, eye_empty_name: str):
-
- this_eyeball_empty = bpy.data.objects[eye_empty_name]
-
- bpy.ops.object.empty_add(type="SPHERE")
- this_gaze_empty = bpy.context.active_object
- print(f"loading {eye_empty_name} gaze data...")
- for frame_num in range(r_gaze_eye_in_head_xyz.shape[0]):
-
- this_gaze_empty.location = (
- gaze_fr_xyz[frame_num, 0],
- gaze_fr_xyz[frame_num, 1],
- gaze_fr_xyz[frame_num, 2],
- )
- this_gaze_empty.scale = (0.01, 0.01, 0.01)
-
- this_gaze_empty.name = eye_empty_name + "_gaze_empty"
-
- this_gaze_empty.keyframe_insert(data_path="location", frame=frame_num)
-
- bpy.ops.object.armature_add(
- enter_editmode=False, align="WORLD", location=(0, 0, 0), scale=(1, 1, 1)
- )
- this_gaze_armature = bpy.context.active_object
- this_gaze_armature.name = eye_empty_name + "_gaze_armature"
-
- this_gaze_bone_name = eye_empty_name + "_gaze_bone"
- this_gaze_bone = this_gaze_armature.data.bones[0]
- this_gaze_bone.name = this_gaze_bone_name
-
- # #create gaze bone
- # this_gaze_edit_bone= this_gaze_armature.data.edit_bones[0] # note this is using EDIT_bones, not regular bones b/c blender is a wild wacky place
- # this_gaze_edit_bone.tail = this_eyeball_empty.location
- # this_gaze_edit_bone.head = this_gaze_empty.location
-
- # track gaze bone to gaze empty
- this_gaze_pose_bone = this_gaze_armature.pose.bones[0]
-
- this_gaze_constraint = this_gaze_pose_bone.constraints.new("COPY_LOCATION")
- this_gaze_constraint.target = this_eyeball_empty
- this_gaze_constraint = this_gaze_pose_bone.constraints.new("DAMPED_TRACK")
- this_gaze_constraint.target = this_gaze_empty
-
-
-try:
- ##% Session path
- # #get session path as command line argument
- argv = sys.argv
- argv = argv[argv.index("--") + 1 :]
- session_path = argv[0]
-
- if len(argv) > 1:
- good_clean_frame_number = int(argv[1])
- else:
- good_clean_frame_number = 0
-except:
- print(
- "we appear to be running from the Blender Scripting tab! Manually enter your `session_path` at line 23"
- )
- session_path = Path(
- r"C:\Users\jonma\Dropbox\FreeMoCapProject\FreeMocap_Data\sesh_2022-05-07_17_15_05_pupil_wobble_juggle_0"
- )
-
-
-data_arrays_path = session_path / "DataArrays"
-
-path_to_right_eye_gaze_xyz_npy = data_arrays_path / "right_eye_gaze_fr_xyz.npy"
-path_to_left_eye_gaze_xyz_npy = data_arrays_path / "left_eye_gaze_fr_xyz.npy"
-
-
-# right eye
-print(f"loading right_eye_data...")
-r_gaze_eye_in_head_xyz = np.load(path_to_right_eye_gaze_xyz_npy)
-r_gaze_eye_in_head_xyz *= 0.001 # convert to meters
-load_gaze_data(r_gaze_eye_in_head_xyz, "right_eye")
-
-# right eye
-print(f"loading left_eye_data...")
-l_gaze_eye_in_head_xyz = np.load(path_to_left_eye_gaze_xyz_npy)
-l_gaze_eye_in_head_xyz *= 0.001 # convert to meters
-load_gaze_data(l_gaze_eye_in_head_xyz, "left_eye")
-
-
-print("done!")
diff --git a/src/pupil_labs_stuff/pupil_freemocap_calibration_pipeline_orchestrator.py b/src/pupil_labs_stuff/pupil_freemocap_calibration_pipeline_orchestrator.py
deleted file mode 100644
index 66fdcafe..00000000
--- a/src/pupil_labs_stuff/pupil_freemocap_calibration_pipeline_orchestrator.py
+++ /dev/null
@@ -1,214 +0,0 @@
-import copy
-import logging
-from pathlib import Path
-from typing import Union
-import numpy as np
-from rich import inspect
-from jon_scratch.pupil_calibration_pipeline.data_classes.freemocap_session_data_class import (
- FreemocapSessionDataClass,
-)
-from jon_scratch.pupil_calibration_pipeline.rotation_matrix_calculator import (
- RotationMatrixCalculator,
-)
-from jon_scratch.pupil_calibration_pipeline.pupil_freemocap_synchronizer import (
- PupilFreemocapSynchronizer,
-)
-from jon_scratch.pupil_calibration_pipeline.qt_gl_laser_skeleton_visualizer import (
- QtGlLaserSkeletonVisualizer,
-)
-from jon_scratch.pupil_calibration_pipeline.session_data_loader import SessionDataLoader
-from jon_scratch.pupil_calibration_pipeline.vor_calibrator import VorCalibrator
-
-logger = logging.getLogger(__name__)
-logger.setLevel(logging.INFO)
-
-
-class PupilFreemocapCalibrationPipelineOrchestrator:
- session_data_loader: SessionDataLoader = None
- raw_session_data = FreemocapSessionDataClass()
- vor_frame_start: int = (None,)
- vor_frame_end: int = None
-
- def __init__(
- self,
- session_path: Union[Path, str],
- debug: bool = False,
- vor_frame_start: int = None,
- vor_frame_end: int = None,
- ):
- logger.info(
- f"initializing pupil-freemocap calibration pipeline orchestrator for session: {session_path}"
- )
- self.session_path = session_path
- self.session_id = self.session_path.stem
- self.raw_session_data.session_id = self.session_id
- self.session_data_loader = SessionDataLoader(self.session_path)
- self.debug = debug
-
- if vor_frame_start is not None:
- self.vor_frame_start = vor_frame_start
- if vor_frame_end is not None:
- self.vor_frame_end = vor_frame_end
-
- def run(self):
- logger.info(
- f"loading session data from {self.session_data_loader.session_path}"
- )
-
- ####
- # load raw freemocap data
- ####
- self.raw_session_data.timestamps = (
- self.session_data_loader.load_freemocap_unix_timestamps()
- )
- logger.info(
- f"self.raw_session_data.freemocap_timestamps.shape: {self.raw_session_data.timestamps.shape}"
- )
-
- self.raw_session_data.mediapipe_skel_fr_mar_xyz = (
- self.session_data_loader.load_mediapipe_data()
- )
- logger.info(
- f"self.raw_session_data.mediapipe_skel_fr_mar_dim.shape: {self.raw_session_data.mediapipe_skel_fr_mar_xyz.shape}"
- )
-
- ####
- # load pupil data
- ####
- pupil_data_handler = self.session_data_loader.load_pupil_data()
- self.raw_session_data.right_eye_pupil_labs_data = (
- pupil_data_handler.get_eye_data("right")
- )
- self.raw_session_data.left_eye_pupil_labs_data = (
- pupil_data_handler.get_eye_data("left")
- )
-
- ####
- # Synchronize pupil data with freemocap data - results in synchronized_session_data (each stream has exactly the same number of frames)
- ####
- synchronized_session_data = PupilFreemocapSynchronizer(
- self.raw_session_data
- ).synchronize(
- vor_frame_start=self.vor_frame_start,
- vor_frame_end=self.vor_frame_end,
- debug=False,
- )
-
- logger.info(
- "synchronization complete - I should add a test to make sure everything has the same number of frames"
- )
-
- ####
- # Calculate Head Rotation matrix for each frame (gaze data will be rotated by head_rot, then calibrated_offset_rot)
- ####
- rotation_matrix_calculator = RotationMatrixCalculator(
- synchronized_session_data.mediapipe_skel_fr_mar_xyz
- )
-
- synchronized_session_data.head_rotation_data = (
- rotation_matrix_calculator.calculate_head_rotation_matricies(debug=False)
- )
-
- synchronized_session_data.right_eye_socket_rotation_data = (
- rotation_matrix_calculator.calculate_eye_rotation_matricies(
- eye="right",
- debug=False,
- )
- )
-
- synchronized_session_data.left_eye_socket_rotation_data = (
- rotation_matrix_calculator.calculate_eye_rotation_matricies(
- "left",
- debug=False,
- )
- )
-
- logger.info(
- f"len(synchronized_session_data.head_rotation_data.head_rotation_matricies): {len(synchronized_session_data.head_rotation_data.rotation_matricies)}"
- )
-
- ####
- # Perform Vestibular-Ocular-Reflex based calibration (see methods from (Matthis et al, 2018 and 2022) for deetos)
- ####
- vor_calibrator = VorCalibrator(
- synchronized_session_data.mediapipe_skel_fr_mar_xyz.copy(),
- vor_start_frame=self.vor_frame_start,
- vor_end_frame=self.vor_frame_end,
- debug=False,
- )
- right_index_fingertip_idx = 41 # pretty sure this is right?
- fixation_point_fr_xyz = synchronized_session_data.mediapipe_skel_fr_mar_xyz[
- self.vor_frame_start : self.vor_frame_end, right_index_fingertip_idx, :
- ]
- # right eye
- synchronized_session_data.right_gaze_vector_endpoint_fr_xyz = (
- vor_calibrator.calibrate(
- copy.deepcopy(synchronized_session_data.right_eye_pupil_labs_data),
- copy.deepcopy(synchronized_session_data.right_eye_socket_rotation_data),
- copy.deepcopy(synchronized_session_data.head_rotation_data),
- fixation_point_fr_xyz,
- )
- )
- # left eye
- synchronized_session_data.left_gaze_vector_endpoint_fr_xyz = (
- vor_calibrator.calibrate(
- synchronized_session_data.left_eye_pupil_labs_data,
- synchronized_session_data.left_eye_socket_rotation_data,
- copy.deepcopy(synchronized_session_data.head_rotation_data),
- fixation_point_fr_xyz,
- )
- )
-
- # save that data
- self.save_gaze_data(synchronized_session_data)
- ####
- # Play laser skeleton animation (as both a cool thing and a debug tool)
- ####
-
- qt_gl_laser_skeleton = QtGlLaserSkeletonVisualizer(
- session_data=synchronized_session_data,
- move_data_to_origin=True,
- )
- # start_frame=self.vor_frame_start,
- # end_frame=self.vor_frame_end)
- qt_gl_laser_skeleton.start_animation()
-
- def save_gaze_data(self, synchronized_session_data):
- data_save_path = self.session_path / "DataArrays"
-
- # right eye
- save_right_eye_data_path = data_save_path / "right_eye_gaze_fr_xyz.npy"
- np.save(
- save_right_eye_data_path,
- synchronized_session_data.right_gaze_vector_endpoint_fr_xyz,
- )
-
- # left eye
- save_left_eye_data_path = data_save_path / "left_eye_gaze_fr_xyz.npy"
- np.save(
- save_left_eye_data_path,
- synchronized_session_data.left_gaze_vector_endpoint_fr_xyz,
- )
-
-
-if __name__ == "__main__":
- # session_id = 'sesh_2022-05-07_17_15_05_pupil_wobble_juggle_0'
- # vor_frame_start_in = 614
- # vor_frame_end_in = 1073
-
- session_id = "sesh_2022-02-15_11_54_28_pupil_maybe"
- vor_frame_start_in = 1200
- vor_frame_end_in = 1500
-
- data_path = Path("C:/Users/jonma/Dropbox/FreeMoCapProject/FreeMocap_Data/")
- this_session_path = data_path / session_id
-
- pupil_freemocap_calibration_pipeline_orchestrator = (
- PupilFreemocapCalibrationPipelineOrchestrator(
- this_session_path,
- vor_frame_start=vor_frame_start_in,
- vor_frame_end=vor_frame_end_in,
- )
- )
- pupil_freemocap_calibration_pipeline_orchestrator.run()
- print("done :D ")
diff --git a/src/pupil_labs_stuff/pupil_freemocap_synchronizer.py b/src/pupil_labs_stuff/pupil_freemocap_synchronizer.py
deleted file mode 100644
index d480df9b..00000000
--- a/src/pupil_labs_stuff/pupil_freemocap_synchronizer.py
+++ /dev/null
@@ -1,454 +0,0 @@
-import logging
-
-import numpy as np
-from matplotlib import pyplot as plt
-import matplotlib
-
-from jon_scratch.pupil_calibration_pipeline.data_classes.freemocap_session_data_class import (
- FreemocapSessionDataClass,
-)
-from jon_scratch.pupil_calibration_pipeline.data_classes.pupil_dataclass_and_handler import (
- PupilLabsDataClass,
-)
-
-matplotlib.use("qt5agg")
-logger = logging.getLogger(__name__)
-
-
-class PupilFreemocapSynchronizer:
- """
- synchronize pupil and freemocap timestamps, return synchronized session data (exactly the same number of synchronized frames in each data stream
- """
-
- def __init__(self, raw_session_data: FreemocapSessionDataClass):
- self.raw_session_data = raw_session_data
- self.synchronized_session_data: FreemocapSessionDataClass = None
-
- def synchronize(
- self,
- debug: bool = False,
- vor_frame_start: int = None,
- vor_frame_end: int = None,
- ):
- """
- align freemocap and pupil timestamps and clip the starts and ends of the various data traces so that everything covers the same timespacn
- """
- # find start and end frames shared by all datastreams
- freemocap_timestamps = self.raw_session_data.timestamps
- right_eye_timestamps = (
- self.raw_session_data.right_eye_pupil_labs_data.timestamps
- )
- left_eye_timestamps = self.raw_session_data.left_eye_pupil_labs_data.timestamps
-
- start_time_unix = np.max(
- (freemocap_timestamps[0], right_eye_timestamps[0], left_eye_timestamps[0])
- )
- end_time_unix = np.min(
- (
- freemocap_timestamps[-1],
- right_eye_timestamps[-1],
- left_eye_timestamps[-1],
- )
- )
-
- # freemocap
- if any(freemocap_timestamps >= start_time_unix):
- freemocap_start_frame = np.where(freemocap_timestamps >= start_time_unix)[
- 0
- ][0]
- else:
- freemocap_start_frame = 0
-
- if any(freemocap_timestamps <= end_time_unix):
- freemocap_end_frame = np.where(freemocap_timestamps <= end_time_unix)[0][-1]
- else:
- freemocap_end_frame = len(freemocap_timestamps)
-
- # right eye
- if any(right_eye_timestamps >= start_time_unix):
- right_eye_start_frame = np.where(right_eye_timestamps >= start_time_unix)[
- 0
- ][0]
- else:
- right_eye_start_frame = 0
-
- if any(right_eye_timestamps <= end_time_unix):
- right_eye_end_frame = np.where(right_eye_timestamps <= end_time_unix)[0][-1]
- else:
- right_eye_end_frame = len(right_eye_timestamps)
-
- # left eye
- if any(left_eye_timestamps >= start_time_unix):
- left_eye_start_frame = np.where(left_eye_timestamps >= start_time_unix)[0][
- 0
- ]
- else:
- left_eye_start_frame = 0
-
- if any(left_eye_timestamps <= end_time_unix):
- left_eye_end_frame = np.where(left_eye_timestamps <= end_time_unix)[0][-1]
- else:
- left_eye_end_frame = len(left_eye_timestamps)
-
- self.right_eye_start_frame = right_eye_start_frame
- self.right_eye_end_frame = right_eye_end_frame
- self.left_eye_start_frame = left_eye_start_frame
- self.left_eye_end_frame = left_eye_end_frame
-
- # rebase time onto freemocap's framerate (b/c it's slower than pupil) <- sloppy, assumes mocap slower than eye tracker, which is untrue for, say, GoPros
- self.synchronized_timestamps = self.raw_session_data.timestamps[
- freemocap_start_frame:freemocap_end_frame
- ]
-
- logger.warning(
- "SLOPPY ASSUMPTION: assuming freemocap framerate is always slower than eye tracker (true for webcams, not true for GoPros)"
- )
-
- self.clip_eye_data()
- self.resample_eye_data()
- # self.normalize_eye_data()
-
- self.synchronized_timestamps = (
- self.synchronized_timestamps - self.synchronized_timestamps[0]
- )
-
- assert self.synchronized_timestamps.shape[0] == self.right_eye_theta.shape[0]
- assert self.synchronized_timestamps.shape[0] == self.left_eye_theta.shape[0]
-
- if debug:
- self.show_debug_plots(vor_frame_start, vor_frame_end)
-
- synchronized_right_eye_data = PupilLabsDataClass(
- timestamps=self.synchronized_timestamps,
- theta=self.right_eye_theta,
- phi=self.right_eye_phi,
- pupil_center_normal_x=self.right_eye_pupil_center_normal_x,
- pupil_center_normal_y=self.right_eye_pupil_center_normal_y,
- pupil_center_normal_z=self.right_eye_pupil_center_normal_z,
- eye_d=0,
- )
- synchronized_left_eye_data = PupilLabsDataClass(
- timestamps=self.synchronized_timestamps,
- theta=self.left_eye_theta,
- phi=self.left_eye_phi,
- pupil_center_normal_x=self.left_eye_pupil_center_normal_x,
- pupil_center_normal_y=self.left_eye_pupil_center_normal_y,
- pupil_center_normal_z=self.left_eye_pupil_center_normal_z,
- eye_d=1,
- )
-
- synchronized_session_data = FreemocapSessionDataClass(
- timestamps=self.synchronized_timestamps,
- mediapipe_skel_fr_mar_dim=self.raw_session_data.mediapipe_skel_fr_mar_xyz[
- freemocap_start_frame:freemocap_end_frame, :, :
- ],
- right_eye_pupil_labs_data=synchronized_right_eye_data,
- left_eye_pupil_labs_data=synchronized_left_eye_data,
- )
- return synchronized_session_data
-
- def clip_eye_data(self):
- self.right_eye_timestamps_clipped = (
- self.raw_session_data.right_eye_pupil_labs_data.timestamps[
- self.right_eye_start_frame : self.right_eye_end_frame
- ]
- )
-
- self.right_eye_pupil_center_normal_x_clipped = (
- self.raw_session_data.right_eye_pupil_labs_data.pupil_center_normal_x[
- self.right_eye_start_frame : self.right_eye_end_frame
- ]
- )
-
- self.right_eye_pupil_center_normal_y_clipped = (
- self.raw_session_data.right_eye_pupil_labs_data.pupil_center_normal_y[
- self.right_eye_start_frame : self.right_eye_end_frame
- ]
- )
-
- self.right_eye_pupil_center_normal_z_clipped = (
- self.raw_session_data.right_eye_pupil_labs_data.pupil_center_normal_z[
- self.right_eye_start_frame : self.right_eye_end_frame
- ]
- )
-
- self.right_eye_theta_clipped = (
- self.raw_session_data.right_eye_pupil_labs_data.theta[
- self.right_eye_start_frame : self.right_eye_end_frame
- ]
- )
-
- self.right_eye_phi_clipped = (
- self.raw_session_data.right_eye_pupil_labs_data.phi[
- self.right_eye_start_frame : self.right_eye_end_frame
- ]
- )
-
- self.left_eye_timestamps_clipped = (
- self.raw_session_data.left_eye_pupil_labs_data.timestamps[
- self.left_eye_start_frame : self.left_eye_end_frame
- ]
- )
-
- self.left_eye_pupil_center_normal_x_clipped = (
- self.raw_session_data.left_eye_pupil_labs_data.pupil_center_normal_x[
- self.left_eye_start_frame : self.left_eye_end_frame
- ]
- )
-
- self.left_eye_pupil_center_normal_y_clipped = (
- self.raw_session_data.left_eye_pupil_labs_data.pupil_center_normal_y[
- self.left_eye_start_frame : self.left_eye_end_frame
- ]
- )
-
- self.left_eye_pupil_center_normal_z_clipped = (
- self.raw_session_data.left_eye_pupil_labs_data.pupil_center_normal_z[
- self.left_eye_start_frame : self.left_eye_end_frame
- ]
- )
-
- self.left_eye_theta_clipped = (
- self.raw_session_data.left_eye_pupil_labs_data.theta[
- self.left_eye_start_frame : self.left_eye_end_frame
- ]
- )
-
- self.left_eye_phi_clipped = self.raw_session_data.left_eye_pupil_labs_data.phi[
- self.left_eye_start_frame : self.left_eye_end_frame
- ]
-
- def resample_eye_data(self):
- freemocap_timestamps = self.synchronized_timestamps
- right_eye_timestamps = self.right_eye_timestamps_clipped
- left_eye_timestamps = self.left_eye_timestamps_clipped
-
- self.right_eye_pupil_center_normal_x = np.interp(
- freemocap_timestamps,
- right_eye_timestamps,
- self.right_eye_pupil_center_normal_x_clipped,
- )
- self.right_eye_pupil_center_normal_y = np.interp(
- freemocap_timestamps,
- right_eye_timestamps,
- self.right_eye_pupil_center_normal_y_clipped,
- )
- self.right_eye_pupil_center_normal_z = np.interp(
- freemocap_timestamps,
- right_eye_timestamps,
- self.right_eye_pupil_center_normal_z_clipped,
- )
- self.right_eye_theta = np.interp(
- freemocap_timestamps, right_eye_timestamps, self.right_eye_theta_clipped
- )
- self.right_eye_phi = np.interp(
- freemocap_timestamps, right_eye_timestamps, self.right_eye_phi_clipped
- )
-
- self.left_eye_pupil_center_normal_x = np.interp(
- freemocap_timestamps,
- left_eye_timestamps,
- self.left_eye_pupil_center_normal_x_clipped,
- )
- self.left_eye_pupil_center_normal_y = np.interp(
- freemocap_timestamps,
- left_eye_timestamps,
- self.left_eye_pupil_center_normal_y_clipped,
- )
- self.left_eye_pupil_center_normal_z = np.interp(
- freemocap_timestamps,
- left_eye_timestamps,
- self.left_eye_pupil_center_normal_z_clipped,
- )
- self.left_eye_theta = np.interp(
- freemocap_timestamps, left_eye_timestamps, self.left_eye_theta_clipped
- )
- self.left_eye_phi = np.interp(
- freemocap_timestamps, left_eye_timestamps, self.left_eye_phi_clipped
- )
-
- def normalize_eye_data(self):
- self.right_eye_pupil_center_normal_x = (
- self.right_eye_pupil_center_normal_x
- / np.linalg.norm(self.right_eye_pupil_center_normal_x)
- )
- self.right_eye_pupil_center_normal_y = (
- self.right_eye_pupil_center_normal_y
- / np.linalg.norm(self.right_eye_pupil_center_normal_y)
- )
- self.right_eye_pupil_center_normal_z = (
- self.right_eye_pupil_center_normal_z
- / np.linalg.norm(self.right_eye_pupil_center_normal_z)
- )
-
- self.left_eye_pupil_center_normal_x = (
- self.left_eye_pupil_center_normal_x
- / np.linalg.norm(self.left_eye_pupil_center_normal_x)
- )
- self.left_eye_pupil_center_normal_y = (
- self.left_eye_pupil_center_normal_y
- / np.linalg.norm(self.left_eye_pupil_center_normal_y)
- )
- self.left_eye_pupil_center_normal_z = (
- self.left_eye_pupil_center_normal_z
- / np.linalg.norm(self.left_eye_pupil_center_normal_z)
- )
-
- def show_debug_plots(self, vor_frame_start, vor_frame_end):
-
- ###########################
- # Plot Raw Data
- ###########################
- fig = plt.figure(num=653412, figsize=(10, 20))
- fig.suptitle("Raw data")
- ax1 = fig.add_subplot(411)
- ax1.plot(
- self.raw_session_data.right_eye_pupil_labs_data.timestamps,
- self.raw_session_data.right_eye_pupil_labs_data.pupil_center_normal_x,
- ".-",
- label="right_eye_pupil_center_normal_x",
- )
- ax1.plot(
- self.raw_session_data.right_eye_pupil_labs_data.timestamps,
- self.raw_session_data.right_eye_pupil_labs_data.pupil_center_normal_y,
- ".-",
- label="right_eye_pupil_center_normal_y",
- )
- ax1.plot(
- self.raw_session_data.right_eye_pupil_labs_data.timestamps,
- self.raw_session_data.right_eye_pupil_labs_data.pupil_center_normal_z,
- ".-",
- label="right_eye_pupil_center_normal_z",
- )
- ax1.legend(loc="upper left")
-
- ax2 = fig.add_subplot(412)
- ax2.plot(
- self.raw_session_data.right_eye_pupil_labs_data.timestamps,
- self.raw_session_data.right_eye_pupil_labs_data.theta,
- ".-",
- label="right_eye_theta",
- )
- ax2.plot(
- self.raw_session_data.right_eye_pupil_labs_data.timestamps,
- self.raw_session_data.right_eye_pupil_labs_data.phi,
- ".-",
- label="right_eye_phi",
- )
- ax2.legend(loc="upper left")
-
- ax3 = fig.add_subplot(413)
- ax3.plot(
- self.synchronized_timestamps,
- self.left_eye_pupil_center_normal_x,
- ".-",
- label="left_eye_pupil_center_normal_x",
- )
- ax3.plot(
- self.synchronized_timestamps,
- self.left_eye_pupil_center_normal_y,
- ".-",
- label="left_eye_pupil_center_normal_y",
- )
- ax3.plot(
- self.synchronized_timestamps,
- self.left_eye_pupil_center_normal_z,
- ".-",
- label="left_eye_pupil_center_normal_z",
- )
- ax3.legend(loc="upper left")
-
- ax4 = fig.add_subplot(414)
- ax4.plot(
- self.raw_session_data.left_eye_pupil_labs_data.timestamps,
- self.raw_session_data.left_eye_pupil_labs_data.theta,
- ".-",
- label="left_eye_theta",
- )
- ax4.plot(
- self.raw_session_data.left_eye_pupil_labs_data.timestamps,
- self.raw_session_data.left_eye_pupil_labs_data.phi,
- ".-",
- label="left_eye_phi",
- )
- ax4.legend(loc="upper left")
-
- ###########################
- # Plot synchronized data
- ###########################
-
- fig = plt.figure(num=65341, figsize=(10, 20))
- fig.suptitle("Synchronized data")
- ax1 = fig.add_subplot(411)
- ax1.plot(
- self.synchronized_timestamps[vor_frame_start:vor_frame_end],
- self.right_eye_pupil_center_normal_x[vor_frame_start:vor_frame_end],
- ".-",
- label="right_eye_pupil_center_normal_x",
- )
- ax1.plot(
- self.synchronized_timestamps[vor_frame_start:vor_frame_end],
- self.right_eye_pupil_center_normal_y[vor_frame_start:vor_frame_end],
- ".-",
- label="right_eye_pupil_center_normal_y",
- )
- ax1.plot(
- self.synchronized_timestamps[vor_frame_start:vor_frame_end],
- self.right_eye_pupil_center_normal_z[vor_frame_start:vor_frame_end],
- ".-",
- label="right_eye_pupil_center_normal_z",
- )
- ax1.legend(loc="upper left")
-
- ax2 = fig.add_subplot(412)
- ax2.plot(
- self.synchronized_timestamps[vor_frame_start:vor_frame_end],
- self.right_eye_theta[vor_frame_start:vor_frame_end],
- ".-",
- label="right_eye_theta",
- )
- ax2.plot(
- self.synchronized_timestamps[vor_frame_start:vor_frame_end],
- self.right_eye_phi[vor_frame_start:vor_frame_end],
- ".-",
- label="right_eye_phi",
- )
- ax2.legend(loc="upper left")
-
- ax3 = fig.add_subplot(413)
- ax3.plot(
- self.synchronized_timestamps[vor_frame_start:vor_frame_end],
- self.left_eye_pupil_center_normal_x[vor_frame_start:vor_frame_end],
- ".-",
- label="left_eye_pupil_center_normal_x",
- )
- ax3.plot(
- self.synchronized_timestamps[vor_frame_start:vor_frame_end],
- self.left_eye_pupil_center_normal_y[vor_frame_start:vor_frame_end],
- ".-",
- label="left_eye_pupil_center_normal_y",
- )
- ax3.plot(
- self.synchronized_timestamps[vor_frame_start:vor_frame_end],
- self.left_eye_pupil_center_normal_z[vor_frame_start:vor_frame_end],
- ".-",
- label="left_eye_pupil_center_normal_z",
- )
- ax3.legend(loc="upper left")
-
- ax4 = fig.add_subplot(414)
- ax4.plot(
- self.synchronized_timestamps[vor_frame_start:vor_frame_end],
- self.left_eye_theta[vor_frame_start:vor_frame_end],
- ".-",
- label="left_eye_theta",
- )
- ax4.plot(
- self.synchronized_timestamps[vor_frame_start:vor_frame_end],
- self.left_eye_phi[vor_frame_start:vor_frame_end],
- ".-",
- label="left_eye_phi",
- )
- ax4.legend(loc="upper left")
-
- plt.show()
diff --git a/src/pupil_labs_stuff/qt_gl_laser_skeleton_visualizer.py b/src/pupil_labs_stuff/qt_gl_laser_skeleton_visualizer.py
deleted file mode 100644
index 94d5face..00000000
--- a/src/pupil_labs_stuff/qt_gl_laser_skeleton_visualizer.py
+++ /dev/null
@@ -1,602 +0,0 @@
-# adapted from - https://gist.github.com/markjay4k/da2f55e28514be7160a7c5fbf95bd243
-import logging
-from pathlib import Path
-from typing import Union, List
-
-from pyqtgraph.Qt import QtCore, QtGui
-import pyqtgraph.opengl as gl
-import pyqtgraph as pg
-import numpy as np
-import sys
-from mediapipe.python.solutions import holistic as mp_holistic
-
-from jon_scratch.pupil_calibration_pipeline.data_classes.freemocap_session_data_class import (
- FreemocapSessionDataClass,
-)
-from jon_scratch.pupil_calibration_pipeline.data_classes.rotation_data_class import (
- RotationDataClass,
-)
-from jon_scratch.pupil_calibration_pipeline.session_data_loader import SessionDataLoader
-
-logger = logging.getLogger(__name__)
-
-
-class QtGlLaserSkeletonVisualizer:
- session_path: Path = None
-
- def __init__(
- self,
- session_data: FreemocapSessionDataClass = None,
- mediapipe_skel_fr_mar_xyz: np.ndarray = None,
- start_frame: int = None,
- end_frame: int = None,
- move_data_to_origin: bool = True,
- ):
-
- if session_data is not None:
- self.session_data = session_data
- self.mediapipe_fr_mar_xyz = session_data.mediapipe_skel_fr_mar_xyz
- elif mediapipe_skel_fr_mar_xyz is not None:
- self.mediapipe_fr_mar_xyz = mediapipe_skel_fr_mar_xyz
- else:
- raise ValueError(
- "Must provide either session data or mediapipe skeleton data"
- )
-
- if move_data_to_origin:
- self.move_data_to_origin()
-
- if start_frame is None:
- self.start_frame_number = 0
- else:
- self.start_frame_number = start_frame
- if end_frame is None:
- self.end_frame_number = self.mediapipe_fr_mar_xyz.shape[0]
- else:
- self.end_frame_number = end_frame
-
- self.current_frame_number = self.start_frame_number
-
- def initialize_display_window(self):
- self.create_app_window()
- self.create_grid_planes()
- self.get_mediapipe_connections()
- self.initialize_skel_dottos()
- self.initialize_skel_lines()
- self.initialize_head_axes()
- self.initialize_eye_socket_axes()
- if self.session_data.right_gaze_vector_endpoint_fr_xyz is not None:
- self.initialize_gaze_lasers()
- self.initialize_gaze_laser_tails(tail_length=30)
-
- def create_app_window(self):
- self.app = pg.mkQApp("Laser Skeleton")
- self.gl_view_widget = gl.GLViewWidget()
- self.gl_view_widget.opts["distance"] = 2000
- self.gl_view_widget.setWindowTitle("FreeMoCap - Laser Skeleton")
- self.gl_view_widget.setGeometry(0, 110, 1920, 1080)
- self.gl_view_widget.show()
-
- def create_grid_planes(self):
- grid_scale = 2e3
- # create the background grids
- grid_plane_x = gl.GLGridItem()
- grid_plane_x.setSize(grid_scale, grid_scale, grid_scale)
- grid_plane_x.setSpacing(grid_scale / 10, grid_scale / 10, grid_scale / 10)
- grid_plane_x.rotate(90, 0, 1, 0)
- grid_plane_x.translate(-grid_scale, 0, 0)
- self.gl_view_widget.addItem(grid_plane_x)
-
- grid_plane_y = gl.GLGridItem()
- grid_plane_y.setSize(grid_scale, grid_scale, grid_scale)
- grid_plane_y.setSpacing(grid_scale / 10, grid_scale / 10, grid_scale / 10)
- grid_plane_y.rotate(90, 1, 0, 0)
- grid_plane_y.translate(0, -grid_scale, 0)
- self.gl_view_widget.addItem(grid_plane_y)
-
- grid_plane_z = gl.GLGridItem()
- grid_plane_z.setSize(grid_scale, grid_scale, grid_scale)
- grid_plane_z.setSpacing(grid_scale / 10, grid_scale / 10, grid_scale / 10)
- grid_plane_z.translate(0, 0, -grid_scale)
- self.gl_view_widget.addItem(grid_plane_z)
-
- def get_mediapipe_connections(self):
- self.mediapipe_body_connections = [
- this_connection for this_connection in mp_holistic.POSE_CONNECTIONS
- ]
- self.mediapipe_hand_connections = [
- this_connection for this_connection in mp_holistic.HAND_CONNECTIONS
- ]
- self.mediapipe_face_connections = [
- this_connection for this_connection in mp_holistic.FACEMESH_TESSELATION
- ]
-
- def initialize_skel_dottos(self):
- self.skeleton_scatter_item = gl.GLScatterPlotItem(
- pos=self.mediapipe_fr_mar_xyz[self.current_frame_number, :, :],
- color=(0, 1, 1, 1),
- size=10,
- pxMode=False,
- )
- self.gl_view_widget.addItem(self.skeleton_scatter_item)
-
- def initialize_skel_lines(self):
- self.skeleton_connections_list = []
- for this_connection in self.mediapipe_body_connections:
- this_skel_line = gl.GLLinePlotItem(
- pos=self.mediapipe_fr_mar_xyz[
- self.current_frame_number, this_connection, :
- ]
- )
- self.skeleton_connections_list.append(this_skel_line)
- self.gl_view_widget.addItem(this_skel_line)
-
- def initialize_gaze_lasers(self):
- # right eye
- this_frame_right_gaze_origin = (
- self.session_data.right_eye_socket_rotation_data.local_origin_fr_xyz[0, :]
- )
- this_frame_right_gaze_endpoint = (
- self.session_data.right_gaze_vector_endpoint_fr_xyz[0, :]
- )
- this_frame_right_gaze_laser = np.array(
- [this_frame_right_gaze_origin, this_frame_right_gaze_endpoint]
- )
-
- self.right_gaze_vector_line_item = gl.GLLinePlotItem(
- pos=this_frame_right_gaze_laser, color=(1, 0, 1, 1), width=3
- )
-
- self.gl_view_widget.addItem(self.right_gaze_vector_line_item)
-
- # left eye
- this_frame_left_gaze_origin = (
- self.session_data.left_eye_socket_rotation_data.local_origin_fr_xyz[0, :]
- )
- this_frame_left_gaze_endpoint = (
- self.session_data.left_gaze_vector_endpoint_fr_xyz[0, :]
- )
- this_frame_left_gaze_laser = np.array(
- [this_frame_left_gaze_origin, this_frame_left_gaze_endpoint]
- )
-
- self.left_gaze_vector_line_item = gl.GLLinePlotItem(
- pos=this_frame_left_gaze_laser, color=(0, 1, 1, 1), width=3
- )
-
- self.gl_view_widget.addItem(self.left_gaze_vector_line_item)
-
- def initialize_gaze_laser_tails(self, tail_length):
- self.tail_length = tail_length
- dummy_tail = np.empty((self.tail_length, 3))
- dummy_tail[:] = np.nan
- self.right_gaze_laser_tail_line_item = gl.GLLinePlotItem(
- pos=dummy_tail, color=(1, 0, 1, 0.5), width=2
- )
- self.left_gaze_laser_tail_line_item = gl.GLLinePlotItem(
- pos=dummy_tail, color=(0, 1, 1, 0.5), width=2
- )
-
- self.gl_view_widget.addItem(self.right_gaze_laser_tail_line_item)
- self.gl_view_widget.addItem(self.left_gaze_laser_tail_line_item)
-
- def initialize_eye_socket_axes(self):
- self.eye_axes_scale = 1e2 / 2
-
- # right eye
- self.right_eye_socket_axes_x_vector_line_item = (
- self.create_axis_vector_line_item(
- 0,
- self.session_data.right_eye_socket_rotation_data,
- dimension="x",
- scale=self.eye_axes_scale,
- color=(1, 0, 0, 1),
- width=3,
- )
- )
- self.right_eye_socket_axes_y_vector_line_item = (
- self.create_axis_vector_line_item(
- 0,
- self.session_data.right_eye_socket_rotation_data,
- dimension="y",
- scale=self.eye_axes_scale,
- color=(0, 1, 0, 1),
- width=3,
- )
- )
- self.right_eye_socket_axes_z_vector_line_item = (
- self.create_axis_vector_line_item(
- 0,
- self.session_data.right_eye_socket_rotation_data,
- dimension="z",
- scale=self.eye_axes_scale,
- color=(0, 0, 1, 1),
- width=3,
- )
- )
-
- self.gl_view_widget.addItem(self.right_eye_socket_axes_x_vector_line_item)
- self.gl_view_widget.addItem(self.right_eye_socket_axes_y_vector_line_item)
- self.gl_view_widget.addItem(self.right_eye_socket_axes_z_vector_line_item)
-
- # left eye
- self.left_eye_socket_axes_x_vector_line_item = (
- self.create_axis_vector_line_item(
- 0,
- self.session_data.left_eye_socket_rotation_data,
- dimension="x",
- scale=self.eye_axes_scale,
- color=(1, 0, 0, 1),
- width=3,
- )
- )
- self.left_eye_socket_axes_y_vector_line_item = (
- self.create_axis_vector_line_item(
- 0,
- self.session_data.left_eye_socket_rotation_data,
- dimension="y",
- scale=self.eye_axes_scale,
- color=(0, 1, 0, 1),
- width=3,
- )
- )
- self.left_eye_socket_axes_z_vector_line_item = (
- self.create_axis_vector_line_item(
- 0,
- self.session_data.left_eye_socket_rotation_data,
- dimension="z",
- scale=self.eye_axes_scale,
- color=(0, 0, 1, 1),
- width=3,
- )
- )
-
- self.gl_view_widget.addItem(self.left_eye_socket_axes_x_vector_line_item)
- self.gl_view_widget.addItem(self.left_eye_socket_axes_y_vector_line_item)
- self.gl_view_widget.addItem(self.left_eye_socket_axes_z_vector_line_item)
-
- def initialize_head_axes(self):
- self.head_axes_scale = 1e2
-
- first_frame_head_center_xyz = (
- self.session_data.head_rotation_data.local_origin_fr_xyz[0, :]
- )
-
- self.head_axes_x_vector_line_item = self.create_axis_vector_line_item(
- 0,
- self.session_data.head_rotation_data,
- dimension="x",
- scale=self.head_axes_scale,
- color=(1, 0, 0, 1),
- width=3,
- )
- self.head_axes_y_vector_line_item = self.create_axis_vector_line_item(
- 0,
- self.session_data.head_rotation_data,
- dimension="y",
- scale=self.head_axes_scale,
- color=(0, 1, 0, 1),
- width=3,
- )
- self.head_axes_z_vector_line_item = self.create_axis_vector_line_item(
- 0,
- self.session_data.head_rotation_data,
- dimension="z",
- scale=self.head_axes_scale,
- color=(0, 0, 1, 1),
- width=3,
- )
-
- self.gl_view_widget.addItem(self.head_axes_x_vector_line_item)
- self.gl_view_widget.addItem(self.head_axes_y_vector_line_item)
- self.gl_view_widget.addItem(self.head_axes_z_vector_line_item)
-
- def create_axis_vector_line_item(
- self,
- frame_number: int,
- rotation_data: RotationDataClass,
- dimension: Union[str, int] = None,
- scale: Union[int, float] = 1,
- color=(1, 1, 1, 1),
- width=3,
- ) -> np.ndarray:
-
- this_frame_axis_vector_xyz = self.unit_vector_from_rotation_matrix(
- frame_number, rotation_data, dimension=dimension, scale=scale
- )
- this_frame_axis_vector_line_item = gl.GLLinePlotItem(
- pos=this_frame_axis_vector_xyz, color=color, width=width
- )
- self.gl_view_widget.addItem(this_frame_axis_vector_line_item)
- return this_frame_axis_vector_line_item
-
- def unit_vector_from_rotation_matrix(
- self,
- frame_number: int,
- rotation_data: RotationDataClass,
- dimension: Union[str, int] = None,
- scale: Union[int, float] = 1,
- ) -> np.ndarray:
-
- try:
- if dimension == "x":
- dimension = 0
- elif dimension == "y":
- dimension = 1
- elif dimension == "z":
- dimension = 2
-
- if dimension > rotation_data.rotation_matricies[0].shape[1]:
- raise ValueError(
- "dimension must be `x`, `y`, `z`, or an integer less than the number of dimensions in the rotation matrix"
- )
- except:
- raise ValueError("something weird about the `dimension` argument")
-
- this_rot_mat = rotation_data.rotation_matricies[frame_number]
- this_axis_vector_endpoint_xyz = rotation_data.local_origin_fr_xyz[
- frame_number, :
- ] + (this_rot_mat[dimension, :] * scale)
- this_axis_vector_origin_xyz = rotation_data.local_origin_fr_xyz[frame_number, :]
-
- this_axis_vector_line_xyz = np.array(
- [this_axis_vector_origin_xyz, this_axis_vector_endpoint_xyz]
- )
-
- return this_axis_vector_line_xyz
-
- def update(self):
- self.update_frame_number()
- if self.current_frame_number % 10 == 0:
- print(f"frame number: {self.current_frame_number}")
-
- self.skeleton_scatter_item.setData(
- pos=self.mediapipe_fr_mar_xyz[self.current_frame_number, :, :]
- )
- self.update_skeleton_lines()
- self.update_head_axis_lines()
- self.update_eye_axis_lines()
- if self.session_data.right_gaze_vector_endpoint_fr_xyz is not None:
- self.update_gaze_lasers()
- self.update_gaze_laser_tails()
-
- def update_skeleton_lines(self):
- for this_skeleton_line_number, this_connection in enumerate(
- self.mediapipe_body_connections
- ):
- self.skeleton_connections_list[this_skeleton_line_number].setData(
- pos=self.mediapipe_fr_mar_xyz[
- self.current_frame_number, this_connection, :
- ]
- )
-
- def update_head_axis_lines(self):
- # X
- this_frame_head_axis_x_vector_xyz = self.unit_vector_from_rotation_matrix(
- self.current_frame_number,
- self.session_data.head_rotation_data,
- dimension="x",
- scale=self.head_axes_scale,
- )
- self.head_axes_x_vector_line_item.setData(pos=this_frame_head_axis_x_vector_xyz)
-
- # Y
- this_frame_head_axis_y_vector_xyz = self.unit_vector_from_rotation_matrix(
- self.current_frame_number,
- self.session_data.head_rotation_data,
- dimension="y",
- scale=self.head_axes_scale,
- )
- self.head_axes_y_vector_line_item.setData(pos=this_frame_head_axis_y_vector_xyz)
-
- # Z
- this_frame_head_axis_z_vector_xyz = self.unit_vector_from_rotation_matrix(
- self.current_frame_number,
- self.session_data.head_rotation_data,
- dimension="z",
- scale=self.head_axes_scale,
- )
- self.head_axes_z_vector_line_item.setData(pos=this_frame_head_axis_z_vector_xyz)
-
- def update_eye_axis_lines(self):
- # right right eye
- # X
- this_frame_right_eye_socket_axis_x_vector_xyz = (
- self.unit_vector_from_rotation_matrix(
- self.current_frame_number,
- self.session_data.right_eye_socket_rotation_data,
- dimension="x",
- scale=self.eye_axes_scale,
- )
- )
- self.right_eye_socket_axes_x_vector_line_item.setData(
- pos=this_frame_right_eye_socket_axis_x_vector_xyz
- )
-
- # Y
- this_frame_right_eye_socket_axis_y_vector_xyz = (
- self.unit_vector_from_rotation_matrix(
- self.current_frame_number,
- self.session_data.right_eye_socket_rotation_data,
- dimension="y",
- scale=self.eye_axes_scale,
- )
- )
- self.right_eye_socket_axes_y_vector_line_item.setData(
- pos=this_frame_right_eye_socket_axis_y_vector_xyz
- )
-
- # Z
- this_frame_right_eye_socket_axis_z_vector_xyz = (
- self.unit_vector_from_rotation_matrix(
- self.current_frame_number,
- self.session_data.right_eye_socket_rotation_data,
- dimension="z",
- scale=self.eye_axes_scale,
- )
- )
- self.right_eye_socket_axes_z_vector_line_item.setData(
- pos=this_frame_right_eye_socket_axis_z_vector_xyz
- )
-
- # left eye
- # X
- this_frame_left_eye_socket_axis_x_vector_xyz = (
- self.unit_vector_from_rotation_matrix(
- self.current_frame_number,
- self.session_data.left_eye_socket_rotation_data,
- dimension="x",
- scale=self.eye_axes_scale,
- )
- )
- self.left_eye_socket_axes_x_vector_line_item.setData(
- pos=this_frame_left_eye_socket_axis_x_vector_xyz
- )
-
- # Y
- this_frame_left_eye_socket_axis_y_vector_xyz = (
- self.unit_vector_from_rotation_matrix(
- self.current_frame_number,
- self.session_data.left_eye_socket_rotation_data,
- dimension="y",
- scale=self.eye_axes_scale,
- )
- )
- self.left_eye_socket_axes_y_vector_line_item.setData(
- pos=this_frame_left_eye_socket_axis_y_vector_xyz
- )
-
- # Z
- this_frame_left_eye_socket_axis_z_vector_xyz = (
- self.unit_vector_from_rotation_matrix(
- self.current_frame_number,
- self.session_data.left_eye_socket_rotation_data,
- dimension="z",
- scale=self.eye_axes_scale,
- )
- )
- self.left_eye_socket_axes_z_vector_line_item.setData(
- pos=this_frame_left_eye_socket_axis_z_vector_xyz
- )
-
- def update_gaze_lasers(self):
- # right eye
- this_right_gaze_laser_line = np.array(
- [
- self.session_data.right_eye_socket_rotation_data.local_origin_fr_xyz[
- self.current_frame_number, :
- ],
- self.session_data.right_gaze_vector_endpoint_fr_xyz[
- self.current_frame_number, :
- ],
- ]
- )
- self.right_gaze_vector_line_item.setData(pos=this_right_gaze_laser_line)
-
- # left eye
- this_left_gaze_laser_line = np.array(
- [
- self.session_data.left_eye_socket_rotation_data.local_origin_fr_xyz[
- self.current_frame_number, :
- ],
- self.session_data.left_gaze_vector_endpoint_fr_xyz[
- self.current_frame_number, :
- ],
- ]
- )
-
- self.left_gaze_vector_line_item.setData(pos=this_left_gaze_laser_line)
-
- def update_gaze_laser_tails(self):
- if self.current_frame_number < self.tail_length:
- return
-
- # right eye
- this_right_gaze_laser_tail = (
- self.session_data.right_gaze_vector_endpoint_fr_xyz[
- self.current_frame_number
- - self.tail_length : self.current_frame_number,
- :,
- ]
- )
- self.right_gaze_laser_tail_line_item.setData(pos=this_right_gaze_laser_tail)
-
- # left eye
- this_left_gaze_laser_tail = self.session_data.left_gaze_vector_endpoint_fr_xyz[
- self.current_frame_number - self.tail_length : self.current_frame_number, :
- ]
- self.left_gaze_laser_tail_line_item.setData(pos=this_left_gaze_laser_tail)
-
- def update_frame_number(self):
- self.current_frame_number += 1
- if self.current_frame_number >= self.end_frame_number:
- self.current_frame_number = self.start_frame_number
-
- def start(self):
- print("starting animation")
- pg.exec()
-
- def start_animation(self):
- print("initializing display window")
- self.initialize_display_window()
- timer = QtCore.QTimer()
- timer.timeout.connect(self.update)
- timer.start(33)
- self.start()
-
- def move_data_to_origin(self):
- mean_position_xyz = np.nanmedian(
- np.nanmedian(self.mediapipe_fr_mar_xyz, axis=0), axis=0
- )
-
- self.mediapipe_fr_mar_xyz[:, :, 0] -= mean_position_xyz[0]
- self.mediapipe_fr_mar_xyz[:, :, 1] -= mean_position_xyz[1]
- self.mediapipe_fr_mar_xyz[:, :, 2] -= mean_position_xyz[2]
-
- self.session_data.head_rotation_data.local_origin_fr_xyz[
- :, 0
- ] -= mean_position_xyz[0]
- self.session_data.head_rotation_data.local_origin_fr_xyz[
- :, 1
- ] -= mean_position_xyz[1]
- self.session_data.head_rotation_data.local_origin_fr_xyz[
- :, 2
- ] -= mean_position_xyz[2]
-
- if self.session_data.right_gaze_vector_endpoint_fr_xyz is not None:
- self.session_data.right_gaze_vector_endpoint_fr_xyz[
- :, 0
- ] -= mean_position_xyz[0]
- self.session_data.right_gaze_vector_endpoint_fr_xyz[
- :, 1
- ] -= mean_position_xyz[1]
- self.session_data.right_gaze_vector_endpoint_fr_xyz[
- :, 2
- ] -= mean_position_xyz[2]
-
- self.session_data.left_gaze_vector_endpoint_fr_xyz[
- :, 0
- ] -= mean_position_xyz[0]
- self.session_data.left_gaze_vector_endpoint_fr_xyz[
- :, 1
- ] -= mean_position_xyz[1]
- self.session_data.left_gaze_vector_endpoint_fr_xyz[
- :, 2
- ] -= mean_position_xyz[2]
-
-
-if __name__ == "__main__":
- # session_id = 'sesh_2022-02-15_11_54_28_pupil_maybe'
- session_id = "sesh_2022-05-03_13_43_00_JSM_treadmill_day2_t0"
- data_path = Path("C:/Users/jonma/Dropbox/FreeMoCapProject/FreeMocap_Data/")
- session_path = data_path / session_id
-
- session_data_loader = SessionDataLoader(session_path)
- mediapipe_skel_fr_mar_xyz_in = session_data_loader.load_mediapipe_data(
- move_to_origin=True
- )
- print(f"mediapipe_skel_fr_mar_xyz.shape: {mediapipe_skel_fr_mar_xyz_in.shape}")
- qt_gl_laser_skeleton = QtGlLaserSkeletonVisualizer(
- mediapipe_skel_fr_mar_xyz=mediapipe_skel_fr_mar_xyz_in,
- )
- qt_gl_laser_skeleton.start_animation()
diff --git a/src/pupil_labs_stuff/rotation_matrix_calculator.py b/src/pupil_labs_stuff/rotation_matrix_calculator.py
deleted file mode 100644
index e23f7bce..00000000
--- a/src/pupil_labs_stuff/rotation_matrix_calculator.py
+++ /dev/null
@@ -1,357 +0,0 @@
-import logging
-from typing import List
-
-import numpy as np
-
-import matplotlib.pyplot as plt
-import matplotlib
-import keyboard
-
-from jon_scratch.pupil_calibration_pipeline.data_classes.rotation_data_class import (
- RotationDataClass,
-)
-
-logger = logging.getLogger(__name__)
-logger.setLevel(logging.INFO)
-
-matplotlib.use("qt5agg")
-
-
-def pin_point_new_origin(point_xyz, new_origin_xyz):
- return point_xyz - new_origin_xyz
-
-
-def normalize_length(point_xyz):
- return point_xyz / get_norm_length(point_xyz, axis=1)[:, None]
-
-
-def get_norm_length(point_xyz, axis=1):
- return np.linalg.norm(point_xyz, axis=axis)
-
-
-class RotationMatrixCalculator:
- mediapipe_skeleton_fr_mar_xyz: np.ndarray
-
- def __init__(self, mediapipe_skeleton_fr_mar_xyz):
- self.mediapipe_skeleton_fr_mar_xyz = mediapipe_skeleton_fr_mar_xyz
-
- def calculate_head_rotation_matricies(
- self, normalize_length_by_x: bool = False, debug: bool = False
- ):
- """
- # Calculate head rotation matricies
-
- calculate orthonormal basis vectors of the head on each frame, stack them on top of each other to make 3x3 rotation matricies, because apparently that's how that works?!
-
- 1 - calculate `head_center_xyz` as mean of left and right ear markers
- 2 - define x+ as vector between `head_center_xyz` and `nose_xyz`- normalize to get `x_hat`
- 3 - define y+ as vector between `head_center_xyz` and `left_ear_xyz` - normalize to get `y_hat_temp` (will be replaced later, to ensure orthogonal \)
- 4 - define z+ as cross product of `x_hat` and `y_hat`
- 5 - replace `y_hat_temp` with `z_hat` crossed wtih `x_hat` (Pretty sure that makes it right handed...)
-
- Stack x_hat, y_hat, and z_hat on top of each other, and that's your head rotation matrix on that frame
-
- """
- nose_id = 0
- left_ear_id = 7
- right_ear_id = 8
-
- nose_xyz = self.mediapipe_skeleton_fr_mar_xyz[:, nose_id, :].copy()
- right_ear_xyz = self.mediapipe_skeleton_fr_mar_xyz[:, right_ear_id, :].copy()
- left_ear_xyz = self.mediapipe_skeleton_fr_mar_xyz[:, left_ear_id, :].copy()
- head_center_xyz = (right_ear_xyz + left_ear_xyz) / 2
-
- head_rotation_data = self.define_basis_vectors(
- center_point_fr_xyz=head_center_xyz,
- x_direction_fr_xyz=nose_xyz,
- y_direction_fr_xyz=left_ear_xyz,
- normalize_length_by_x=normalize_length_by_x,
- )
- if debug:
- self.show_head_rotation_debug_plot(head_rotation_data)
-
- return head_rotation_data
-
- def calculate_eye_rotation_matricies(
- self,
- eye: str,
- normalize_length_by_x: bool = False,
- debug: bool = False,
- ) -> List[np.ndarray]:
- nose_index = 0
- if eye == "left":
- inner_eye_index = 1
- eye_mid_index = 2
- outer_eye_index = 3
- x_direction_fr_xyz = self.mediapipe_skeleton_fr_mar_xyz[
- :, inner_eye_index, :
- ] # this will make Z+ point forward
- elif eye == "right":
- inner_eye_index = 4
- eye_mid_index = 5
- outer_eye_index = 6
- x_direction_fr_xyz = self.mediapipe_skeleton_fr_mar_xyz[
- :, outer_eye_index, :
- ] # this will make Z+ point forward
- else:
- raise ValueError('`eye` must be "left" or "right"')
-
- y_direction_fr_xyz = self.mediapipe_skeleton_fr_mar_xyz[:, nose_index, :]
-
- eye_mid_fr_xyz = self.mediapipe_skeleton_fr_mar_xyz[:, eye_mid_index, :]
-
- eye_socket_rotation_data = self.define_basis_vectors(
- center_point_fr_xyz=eye_mid_fr_xyz,
- x_direction_fr_xyz=x_direction_fr_xyz,
- y_direction_fr_xyz=y_direction_fr_xyz,
- normalize_length_by_x=normalize_length_by_x,
- )
-
- return eye_socket_rotation_data
-
- def define_basis_vectors(
- self,
- center_point_fr_xyz: np.ndarray = None,
- x_direction_fr_xyz: np.ndarray = None,
- y_direction_fr_xyz: np.ndarray = None,
- z_direction_fr_xyz: np.ndarray = None,
- normalize_length_by_x: bool = True,
- ) -> RotationDataClass:
- """
- create orthonormal basis vectors based on a center point and at least TWO of the following = a point defining X direction, a point defining Y direction, and a point defining Z direction
- """
-
- x_known = True
- y_known = True
- z_known = True
-
- if x_direction_fr_xyz is None:
- x_known = False
- x_direction_fr_xyz = np.empty(center_point_fr_xyz.shape)
- x_direction_fr_xyz[:] = np.nan
-
- if y_direction_fr_xyz is None:
- y_known = False
- y_direction_fr_xyz = np.empty(center_point_fr_xyz.shape)
- y_direction_fr_xyz[:] = np.nan
-
- if z_direction_fr_xyz is None:
- z_known = False
- z_direction_fr_xyz = np.empty(center_point_fr_xyz.shape)
- z_direction_fr_xyz[:] = np.nan
-
- if sum([x_known, y_known, z_known]) < 2:
- raise ValueError(
- "Must specify at least two of the following: x_direction_fr_xyz, y_direction_fr_xyz, z_direction_fr_xyz"
- )
-
- if (
- center_point_fr_xyz is not None
- ): # if center point is specified, then use it to zero out the x,y,z directions vectors
- zero_x_direction_xyz = pin_point_new_origin(
- x_direction_fr_xyz, center_point_fr_xyz
- )
- zero_y_direction_xyz = pin_point_new_origin(
- y_direction_fr_xyz, center_point_fr_xyz
- )
- zero_z_direction_xyz = pin_point_new_origin(
- z_direction_fr_xyz, center_point_fr_xyz
- )
- else:
- zero_x_direction_xyz = x_direction_fr_xyz
- zero_y_direction_xyz = y_direction_fr_xyz
- zero_z_direction_xyz = z_direction_fr_xyz
-
- x_hat_xyz = None
- y_hat_xyz = None
- z_hat_xyz = None
-
- if x_known:
- x_norm_length = np.nanmean(get_norm_length(zero_x_direction_xyz))
- x_hat_xyz = normalize_length(zero_x_direction_xyz)
- if y_known: # we know x and y directions and need to find Z by X cross Y
- z_hat_xyz = normalize_length(np.cross(x_hat_xyz, zero_y_direction_xyz))
- y_hat_xyz = normalize_length(np.cross(z_hat_xyz, x_hat_xyz))
-
- else: # we know x and z directions and need to find Y by Z cross X
- y_hat_xyz = normalize_length(np.cross(zero_z_direction_xyz, x_hat_xyz))
- z_hat_xyz = normalize_length(np.cross(x_hat_xyz, y_hat_xyz))
-
- elif y_known: # we know y and z directions and need to find X by Y cross Z
- y_hat_xyz = normalize_length(zero_y_direction_xyz)
- x_hat_xyz = normalize_length(np.cross(y_hat_xyz, zero_z_direction_xyz))
- z_hat_xyz = normalize_length(np.cross(x_hat_xyz, y_hat_xyz))
-
- if normalize_length_by_x:
- x_hat_xyz = x_hat_xyz * x_norm_length
- y_hat_xyz = y_hat_xyz * x_norm_length
- z_hat_xyz = z_hat_xyz * x_norm_length
-
- # #umm, this shouldn't be necessary.... but it makes it work, so....
- # x_hat_xyz = -x_hat_xyz
- # y_hat_xyz = -y_hat_xyz
- # z_hat_xyz = z_hat_xyz
-
- # create 3x3 cosine rotation matricies by stacking X_hat, Y_hat, and Z_hat
- rotation_matricies = []
- frame_number = -1
- for this_x_hat_xyz, this_y_hat_xyz, this_z_hat_xyz in zip(
- x_hat_xyz, y_hat_xyz, z_hat_xyz
- ):
- frame_number += 1
- if frame_number > 1000:
- f = 9
- this_rotation_matrix = np.squeeze(
- np.dstack((this_x_hat_xyz, this_y_hat_xyz, this_z_hat_xyz))
- )
-
- assert this_rotation_matrix.shape == (3, 3)
-
- if not np.isnan(this_x_hat_xyz).any():
- assert (this_rotation_matrix[:, 0] == this_x_hat_xyz).all()
-
- rotation_matricies.append(this_rotation_matrix)
-
- rotation_matricies = [
- np.transpose(this_rotation_martix)
- for this_rotation_martix in rotation_matricies
- ]
-
- return RotationDataClass(
- rotation_matricies=rotation_matricies,
- local_origin_fr_xyz=center_point_fr_xyz,
- x_hat_norm_fr_xyz=x_hat_xyz,
- y_hat_norm_fr_xyz=y_hat_xyz,
- z_hat_norm_fr_xyz=z_hat_xyz,
- )
-
- def show_head_rotation_debug_plot(self, rotation_data: RotationDataClass):
- rotation_matricies = rotation_data.rotation_matricies
- local_origin_fr_xyz = rotation_data.local_origin_fr_xyz
-
- x_hat_xyz = np.asarray(
- [this_rot_mat[0, :] for this_rot_mat in rotation_matricies]
- )
- y_hat_xyz = np.asarray(
- [this_rot_mat[1, :] for this_rot_mat in rotation_matricies]
- )
- z_hat_xyz = np.asarray(
- [this_rot_mat[2, :] for this_rot_mat in rotation_matricies]
- )
-
- test_point_xyz_og = np.array((1, 1, 1))
- test_point_xyz_rot = np.empty(z_hat_xyz.shape)
- logger.warning(
- "We shouldnt have to transpose the rotation matix here, need to fix this upstream"
- )
-
- for frame_number in range(len(rotation_matricies)):
- # see https://peps.python.org/pep-0465/ for explanation of the `@` operator (which is a "matrix multiplication" operator)
- test_point_xyz_rot[frame_number, :] = (
- np.transpose(rotation_matricies[frame_number]) @ test_point_xyz_og
- )
-
- z_mediapipe_skeleton_fr_mar_xyz = np.empty(
- self.mediapipe_skeleton_fr_mar_xyz.shape
- )
- for this_marker_number in range(self.mediapipe_skeleton_fr_mar_xyz.shape[1]):
- z_mediapipe_skeleton_fr_mar_xyz[
- :, this_marker_number, :
- ] = pin_point_new_origin(
- self.mediapipe_skeleton_fr_mar_xyz[:, this_marker_number, :],
- local_origin_fr_xyz,
- )
- plt.close("all")
-
- fig = plt.figure(num=124)
- fig.suptitle("Head Rotation Matrix - Debug Plot - Press ESC to Quit")
- ax = fig.add_subplot(111, projection="3d")
-
- ax_range = np.nanmean(get_norm_length(x_hat_xyz)) * 2
-
- for frame_number in range(1200, x_hat_xyz.shape[0]):
- ax.clear()
-
- # plot head orthonormal basis vectors
- ax.plot(
- x_hat_xyz[frame_number - 30 : frame_number, 0],
- x_hat_xyz[frame_number - 30 : frame_number, 1],
- x_hat_xyz[frame_number - 30 : frame_number, 2],
- "r-",
- )
-
- ax.plot(
- y_hat_xyz[frame_number - 30 : frame_number, 0],
- y_hat_xyz[frame_number - 30 : frame_number, 1],
- y_hat_xyz[frame_number - 30 : frame_number, 2],
- "g-",
- )
-
- ax.plot(
- z_hat_xyz[frame_number - 30 : frame_number, 0],
- z_hat_xyz[frame_number - 30 : frame_number, 1],
- z_hat_xyz[frame_number - 30 : frame_number, 2],
- "b-",
- )
-
- ax.plot(
- [0, x_hat_xyz[frame_number, 0]],
- [0, x_hat_xyz[frame_number, 1]],
- [0, x_hat_xyz[frame_number, 2]],
- "r-o",
- label="x_hat",
- )
-
- ax.plot(
- [0, y_hat_xyz[frame_number, 0]],
- [0, y_hat_xyz[frame_number, 1]],
- [0, y_hat_xyz[frame_number, 2]],
- "g-o",
- label="y_hat",
- )
-
- ax.plot(
- [0, z_hat_xyz[frame_number, 0]],
- [0, z_hat_xyz[frame_number, 1]],
- [0, z_hat_xyz[frame_number, 2]],
- "b-o",
- label="z_hat",
- )
-
- # plot test point rotated with head rotation matricies
-
- ax.plot(
- test_point_xyz_rot[frame_number - 30 : frame_number, 0],
- test_point_xyz_rot[frame_number - 30 : frame_number, 1],
- test_point_xyz_rot[frame_number - 30 : frame_number, 2],
- "k-",
- )
-
- ax.plot(
- [0, test_point_xyz_rot[frame_number, 0]],
- [0, test_point_xyz_rot[frame_number, 1]],
- [0, test_point_xyz_rot[frame_number, 2]],
- "k-o",
- label="test point",
- )
-
- # plot a friendly skeleton
- ax.scatter(
- z_mediapipe_skeleton_fr_mar_xyz[frame_number, :, 0],
- z_mediapipe_skeleton_fr_mar_xyz[frame_number, :, 1],
- z_mediapipe_skeleton_fr_mar_xyz[frame_number, :, 2],
- "ko",
- )
-
- ax.set_xlim([-ax_range, ax_range])
- ax.set_ylim([-ax_range, ax_range])
- ax.set_zlim([-ax_range, ax_range])
-
- ax.legend()
- plt.pause(0.01)
-
- if keyboard.is_pressed("esc"):
- print("You Pressed Escape!")
- break # finishing the loop
-
- plt.close(fig)
diff --git a/src/pupil_labs_stuff/session_data_loader.py b/src/pupil_labs_stuff/session_data_loader.py
deleted file mode 100644
index 14167196..00000000
--- a/src/pupil_labs_stuff/session_data_loader.py
+++ /dev/null
@@ -1,126 +0,0 @@
-import json
-import logging
-from pathlib import Path
-from typing import Union
-import numpy as np
-import pandas as pd
-
-from jon_scratch.pupil_calibration_pipeline.data_classes.pupil_dataclass_and_handler import (
- PupilLabsDataClass,
- PupilDataHandler,
-)
-
-logger = logging.getLogger(__name__)
-
-
-class SessionDataLoader:
- _session_path: Path = None
-
- def __init__(self, session_path):
-
- self._session_path = Path(session_path)
-
- @property
- def session_path(self):
- return self._session_path
-
- def load_freemocap_unix_timestamps(self):
- """
- load/calculate the unix timestamps for the freemocap data (as mean of each camera's timestamp on each frame)
-
- """
- freemocap_unix_timestamp_path = self.session_path / "unix_synced_timestamps.csv"
- freemocap_unix_timestamps_dataframe = pd.read_csv(freemocap_unix_timestamp_path)
- each_cam_timestamps_list = []
- camera_names = [
- column_name
- for column_name in list(freemocap_unix_timestamps_dataframe.columns)
- if "Cam" in column_name
- ]
-
- for this_camera_name in camera_names:
- each_cam_timestamps_list.append(
- np.array(freemocap_unix_timestamps_dataframe[this_camera_name])
- )
-
- cameras_timestamp_array = np.stack(each_cam_timestamps_list, axis=1)
- cameras_timestamp_array[
- cameras_timestamp_array == -1
- ] = np.nan # replace -1 with nan
-
- freemocap_timestamps = np.nanmean(cameras_timestamp_array, axis=1)
- return freemocap_timestamps
-
- def load_mediapipe_data(
- self,
- session_path: Union[Path, str] = None,
- include_hands: bool = True,
- include_face: bool = False,
- move_to_origin: bool = False,
- ) -> np.ndarray:
-
- if session_path is not None:
- self.session_path(session_path)
-
- if self._session_path is None:
- raise ValueError(
- "Session path is not specified - Can't load mediapipe data without a session path"
- )
-
- mediapipe_data_path = (
- self.session_path / "DataArrays" / "mediaPipeSkel_3d_smoothed.npy"
- )
- logger.info(f"loading mediapipe data from {mediapipe_data_path}")
- mediapipe_fr_mar_xyz = np.load(str(mediapipe_data_path))
-
- if move_to_origin:
- mean_position_xyz = np.nanmedian(
- np.nanmedian(mediapipe_fr_mar_xyz, axis=0), axis=0
- )
- mediapipe_fr_mar_xyz[:, :, 0] -= mean_position_xyz[0]
- mediapipe_fr_mar_xyz[:, :, 1] -= mean_position_xyz[1]
- mediapipe_fr_mar_xyz[:, :, 2] -= mean_position_xyz[2]
-
- if include_face:
- return mediapipe_fr_mar_xyz # body + hands + face
-
- if include_hands:
- return mediapipe_fr_mar_xyz[:, :75, :] # body + hands, but not face
-
- return mediapipe_fr_mar_xyz[:, :33, :] # just the body marker
-
- def load_pupil_data(self) -> PupilDataHandler:
- """
- # load in data recorded with a Pupil Labs eye tracker.
- - pupil data from `pupil_positions.csv` in the **pupil exports** folder
- - definitions in `pupil_gaze_positions_info.txt` of same folder
- - pupil start time from `info.player.json` for syncing
- """
- pupil_data_path = self.session_path / "pupil_000"
- pupil_data_exports_path = pupil_data_path / "exports" / "000"
- pupil_positions_path = pupil_data_exports_path / "pupil_positions.csv"
- pupil_recording_info_path = pupil_data_path / "info.player.json"
- freemocap_unix_timestamp_path = self.session_path / "unix_synced_timestamps.csv"
-
- logger.info(f"loading pupil data from {pupil_positions_path}")
- pupil_dataframe = pd.read_csv(pupil_positions_path)
- pupil_recording_info_json = json.load(open(pupil_recording_info_path))
- freemocap_unix_timestamps_dataframe = pd.read_csv(freemocap_unix_timestamp_path)
-
- pupil_data_handler = PupilDataHandler(pupil_dataframe)
- pupil_data_handler.convert_to_unix_timestamps(pupil_recording_info_json)
-
- return pupil_data_handler
-
-
-if __name__ == "__main__":
- data_path = Path("C:/Users/jonma/Dropbox/FreeMoCapProject/FreeMocap_Data/")
- session_path = data_path / "sesh_2022-02-15_11_54_28_pupil_maybe"
-
- session_data_loader = SessionDataLoader(session_path)
- pupil_data = session_data_loader.load_pupil_data()
- print(
- "pupil data loaded, but I don't have an easy way to print out the shape of things yet, lol"
- )
- mediapipe_skel_fr_mar_xyz = session_data_loader.load_mediapipe_data()
- print(f"mediapipe_skel_fr_mar_xyz.shape: {mediapipe_skel_fr_mar_xyz.shape}")
diff --git a/src/pupil_labs_stuff/spherical_coordiate_converters/__init__.py b/src/pupil_labs_stuff/spherical_coordiate_converters/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/pupil_labs_stuff/spherical_coordiate_converters/cart2sph_and_sph2cart.py b/src/pupil_labs_stuff/spherical_coordiate_converters/cart2sph_and_sph2cart.py
deleted file mode 100644
index 69c8d392..00000000
--- a/src/pupil_labs_stuff/spherical_coordiate_converters/cart2sph_and_sph2cart.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# copied from https://stackoverflow.com/questions/30084174/efficient-matlab-cart2sph-and-sph2cart-functions-in-python
-import numpy as np
-
-
-def cart2sph(x, y, z):
- azimuth = np.arctan2(y, x)
- elevation = np.arctan2(z, np.sqrt(x**2 + y**2))
- r = np.sqrt(x**2 + y**2 + z**2)
- return azimuth, elevation, r
-
-
-def sph2cart(azimuth, elevation, r):
- x = r * np.cos(elevation) * np.cos(azimuth)
- y = r * np.cos(elevation) * np.sin(azimuth)
- z = r * np.sin(elevation)
- return x, y, z
diff --git a/src/pupil_labs_stuff/vor_calibrator.py b/src/pupil_labs_stuff/vor_calibrator.py
deleted file mode 100644
index aa730d73..00000000
--- a/src/pupil_labs_stuff/vor_calibrator.py
+++ /dev/null
@@ -1,378 +0,0 @@
-import logging
-from typing import Union, List
-
-import keyboard
-import numpy as np
-from scipy import optimize
-from matplotlib import pyplot as plt
-import matplotlib
-from scipy.spatial.transform import Rotation
-
-from jon_scratch.pupil_calibration_pipeline.data_classes.freemocap_session_data_class import (
- FreemocapSessionDataClass,
-)
-from jon_scratch.pupil_calibration_pipeline.data_classes.pupil_dataclass_and_handler import (
- PupilLabsDataClass,
-)
-from jon_scratch.pupil_calibration_pipeline.data_classes.rotation_data_class import (
- RotationDataClass,
-)
-from jon_scratch.pupil_calibration_pipeline.spherical_coordiate_converters.cart2sph_and_sph2cart import (
- cart2sph,
- sph2cart,
-)
-
-matplotlib.use("qt5agg")
-logger = logging.getLogger(__name__)
-
-
-class VorCalibrator:
- """
- Calibrate synchronized eye data from a Pupil Labs eye tracker with FreeMoCap skeleton
- see methods sections of (Matthis, Yates, and Hayhoe, Current Biology, 2018) and (Matthis, Muller, Bonnen, Hayehoe, PLoS Computation Biology 2022) for details
- """
-
- def __init__(
- self,
- mediapipe_skel_fr_mar_xyz: np.ndarray,
- vor_start_frame: int = None,
- vor_end_frame: int = None,
- debug: bool = False,
- ):
- self.debug = debug
- self.mediapipe_skel_fr_mar_xyz = mediapipe_skel_fr_mar_xyz
- if vor_start_frame is not None:
- self.vor_start_frame = vor_start_frame
- if vor_end_frame is None:
- raise ValueError(
- "Must specify vor_end_frame if vor_start_frame is specified"
- )
- self.vor_end_frame = vor_end_frame
-
- def calibrate(
- self,
- pupil_labs_eye_data: PupilLabsDataClass,
- eye_socket_rotation_data: RotationDataClass,
- head_rotation_data: RotationDataClass,
- fixation_point_fr_xyz: np.ndarray,
- ) -> np.ndarray:
-
- if not fixation_point_fr_xyz.shape[1] == 3:
- raise Exception(
- "fixation_point_fr_xyz must be a numpy array with 3 columns"
- )
-
- eye_socket_origin_fr_xyz = eye_socket_rotation_data.local_origin_fr_xyz
- eye_socket_rotation_matricies = eye_socket_rotation_data.rotation_matricies
-
- head_rotation_matricies = head_rotation_data.rotation_matricies
-
- # gaze_unit_vector_end_point_fr_xyz = eye_socket_rotation_data.z_hat_norm_fr_xyz
- self.fixation_distance = self.get_distance_between_two_points(
- fixation_point_fr_xyz,
- eye_socket_origin_fr_xyz[self.vor_start_frame : self.vor_end_frame, :],
- )
-
- # not sure why I need to do this, but Karl Muller did it so it's likely necessary
- gaze_y = -pupil_labs_eye_data.pupil_center_normal_y
- gaze_x = pupil_labs_eye_data.pupil_center_normal_z
- gaze_z = pupil_labs_eye_data.pupil_center_normal_x
-
- gaze_x = gaze_x * np.nanmean(self.fixation_distance)
- gaze_y = gaze_y * np.nanmean(self.fixation_distance)
- gaze_z = gaze_z * np.nanmean(self.fixation_distance)
-
- use_dummy_gaze_data = False
- if use_dummy_gaze_data:
- gaze_x = np.zeros(
- pupil_labs_eye_data.pupil_center_normal_x.shape
- ) * np.nanmedian(self.fixation_distance)
- gaze_y = np.zeros(
- pupil_labs_eye_data.pupil_center_normal_y.shape
- ) * np.nanmedian(self.fixation_distance)
- gaze_z = np.ones(
- pupil_labs_eye_data.pupil_center_normal_z.shape
- ) * np.nanmedian(self.fixation_distance)
-
- self.uncalibrated_gaze_vector_endpoint_fr_xyz = self.rotate_gaze_lasers(
- [0, 0, 0],
- eye_socket_origin_fr_xyz,
- eye_socket_rotation_matricies,
- head_rotation_matricies,
- gaze_x,
- gaze_y,
- gaze_z,
- )
-
- self.calibrated_rotational_offset = self.calculate_optimal_rotational_offset(
- eye_socket_origin_fr_xyz,
- eye_socket_rotation_matricies,
- head_rotation_matricies,
- fixation_point_fr_xyz,
- gaze_x,
- gaze_y,
- gaze_z,
- )
-
- gaze_vector_endpoint_fr_xyz = self.rotate_gaze_lasers(
- self.calibrated_rotational_offset,
- eye_socket_origin_fr_xyz,
- eye_socket_rotation_matricies,
- head_rotation_matricies,
- gaze_x,
- gaze_y,
- gaze_z,
- )
-
- return gaze_vector_endpoint_fr_xyz
-
- def calculate_optimal_rotational_offset(
- self,
- eye_socket_origin_fr_xyz: np.ndarray,
- eye_socket_rotation_matricies: List[np.ndarray],
- head_rotation_matricies,
- fixation_point_fr_xyz: np.ndarray,
- gaze_x: np.ndarray,
- gaze_y: np.ndarray,
- gaze_z: np.ndarray,
- ) -> List[float]:
- """
- Calculate the optimal rotational offset to apply to Pupil Labs eye tracker data in order to minimize the distance
- between teh end of the gaze vector and the fixation point on each frame
- (based on the VOR calibration methods described in Matthis, Yates, and Hayhoe, Current Biology, 2018 and Matthis, Muller, Bonnen, Hayhoe, PLoS Computation Biology 2022)
-
- """
- initial_rotational_offset_guess = [0, 0, 0]
-
- vor_frames = np.arange(self.vor_start_frame, self.vor_end_frame)
-
- optimization_results = optimize.least_squares(
- self.get_error_for_a_given_rotational_offset_guess,
- initial_rotational_offset_guess,
- args=(
- eye_socket_origin_fr_xyz[vor_frames, :],
- eye_socket_rotation_matricies[
- self.vor_start_frame : self.vor_end_frame
- ],
- head_rotation_matricies[self.vor_start_frame : self.vor_end_frame],
- fixation_point_fr_xyz,
- gaze_x[vor_frames],
- gaze_y[vor_frames],
- gaze_z[vor_frames],
- ),
- gtol=1e-10,
- verbose=2,
- )
- calibrated_rotational_offset = optimization_results.x
- return calibrated_rotational_offset
-
- def get_error_for_a_given_rotational_offset_guess(
- self,
- rotational_offset_guess,
- eye_socket_origin_fr_xyz,
- eye_socket_rotation_matricies,
- head_rotation_matricies,
- fixation_point_fr_xyz,
- gaze_x,
- gaze_y,
- gaze_z,
- ):
-
- gaze_laser_endpoint_during_vor_fr_xyz = self.rotate_gaze_lasers(
- rotational_offset_guess,
- eye_socket_origin_fr_xyz,
- eye_socket_rotation_matricies,
- head_rotation_matricies,
- gaze_x,
- gaze_y,
- gaze_z,
- )
-
- distance_between_gaze_endpoint_and_fixation_point_fr_xyz = (
- self.get_distance_between_two_points(
- gaze_laser_endpoint_during_vor_fr_xyz, fixation_point_fr_xyz
- )
- )
- distance_error = np.sqrt(
- np.nanmean(distance_between_gaze_endpoint_and_fixation_point_fr_xyz**2)
- )
-
- gaze_tip_velocity_fr_xyz = np.diff(
- gaze_laser_endpoint_during_vor_fr_xyz, axis=0
- )
- mean_gaze_tip_velocity_per_frame = np.nanmean(gaze_tip_velocity_fr_xyz, axis=0)
- velocity_error = np.sqrt(np.nanmean(mean_gaze_tip_velocity_per_frame**2))
-
- error = distance_error + velocity_error
-
- if self.debug:
- self.plot_optimization_error(
- error,
- gaze_laser_endpoint_during_vor_fr_xyz,
- eye_socket_origin_fr_xyz,
- fixation_point_fr_xyz,
- )
- return error
-
- def plot_optimization_error(
- self,
- error,
- gaze_laser_endpoint_during_vor_fr_xyz,
- eye_socket_origin_fr_xyz,
- fixation_point_fr_xyz,
- ):
- figure_number = 13451
-
- if not plt.fignum_exists(figure_number):
- fig = plt.figure(figure_number)
- ax = fig.add_subplot(111, projection="3d")
- else:
- fig = plt.gcf()
- ax = plt.gca()
-
- mean_eye_origin_x = np.nanmean(eye_socket_origin_fr_xyz[:, 0])
- mean_eye_origin_y = np.nanmean(eye_socket_origin_fr_xyz[:, 1])
- mean_eye_origin_z = np.nanmean(eye_socket_origin_fr_xyz[:, 2])
-
- fig.suptitle(f"error: {error}")
- ax_range = 1e3
- ax.clear()
-
- ax.plot(
- mean_eye_origin_x,
- mean_eye_origin_y,
- mean_eye_origin_z,
- "mh",
- label="mean eye origin",
- )
-
- ax.plot(
- self.uncalibrated_gaze_vector_endpoint_fr_xyz[
- self.vor_start_frame : self.vor_end_frame, 0
- ],
- self.uncalibrated_gaze_vector_endpoint_fr_xyz[
- self.vor_start_frame : self.vor_end_frame, 1
- ],
- self.uncalibrated_gaze_vector_endpoint_fr_xyz[
- self.vor_start_frame : self.vor_end_frame, 2
- ],
- "k-o",
- label="original gaze xyz",
- )
-
- ax.plot(
- gaze_laser_endpoint_during_vor_fr_xyz[:, 0],
- gaze_laser_endpoint_during_vor_fr_xyz[:, 1],
- gaze_laser_endpoint_during_vor_fr_xyz[:, 2],
- "r-o",
- label="gaze_rotated_by_guess_then_head_rotation_xyz",
- )
-
- ax.plot(
- fixation_point_fr_xyz[:, 0],
- fixation_point_fr_xyz[:, 1],
- fixation_point_fr_xyz[:, 2],
- "b-o",
- label="mean_fixation_point_xyz",
- )
-
- ax.set_xlim([mean_eye_origin_x - ax_range, mean_eye_origin_x + ax_range])
- ax.set_ylim([mean_eye_origin_y - ax_range, mean_eye_origin_y + ax_range])
- ax.set_zlim([mean_eye_origin_z - ax_range, mean_eye_origin_z + ax_range])
- ax.legend()
- plt.pause(0.01)
-
- if keyboard.is_pressed("esc"):
- print("You Pressed Escape!")
- self.debug = False
- plt.close(fig)
-
- def get_distance_between_two_points(
- self, local_origin_fr_xyz, fixation_point_fr_xyz
- ):
- return np.linalg.norm(local_origin_fr_xyz - fixation_point_fr_xyz, axis=1)
-
- def create_unrotated_gaze_lasers_from_eye_rotation_matrixies(
- self,
- gaze_vector_start_point_fr_xyz: np.ndarray,
- gaze_unit_vector_end_point_fr_xyz: np.ndarray,
- calbration_distance,
- ) -> np.ndarray:
- """
- Creates an unrotated gaze laser for each frame in the skeleton/gaze data. Returns a vector the same length as the calibration_distance, shooting our of the skeletons eye_sockets (as if they eyes were paralyzed).
- """
- if (
- not gaze_vector_start_point_fr_xyz.shape
- == gaze_unit_vector_end_point_fr_xyz.shape
- ):
- raise Exception(
- "`gaze_vector_start_point_fr_xyz` and `gaze_unit_vector_end_point_fr_xyz` must have the same shape"
- )
-
- # scale gaze vector so it's the same norm/length as the calibration distance
- gaze_unit_vector_end_point_fr_xyz = (
- gaze_unit_vector_end_point_fr_xyz * calbration_distance
- )
-
- # move it from an zero-centered reference frame to the eye socket reference frame
- gaze_vector_end_point_fr_xyz = (
- gaze_unit_vector_end_point_fr_xyz + gaze_vector_start_point_fr_xyz
- )
-
- return gaze_vector_end_point_fr_xyz
-
- def rotate_gaze_lasers(
- self,
- rotational_offset,
- gaze_vector_start_point_fr_xyz,
- eye_socket_rotation_matricies,
- head_rotation_matricies,
- gaze_x,
- gaze_y,
- gaze_z,
- ) -> np.ndarray:
- """ "
- - pin gaze to origin
- - rotate gaze vector by `calibrated_rotational_offset`
- - rotate by measured eye movemens (from pupil labs)
- - translate gaze vector back to the eye socket (by adding eyeball center xyz)
- """
-
- # - rotate gaze vector by `calibrated_rotational_offset`
- offset_x_euler = rotational_offset[0]
- offset_y_euler = rotational_offset[1]
- offset_z_euler = rotational_offset[2]
- offset_rotation_matrix_guess = Rotation.from_euler(
- "xyz", (offset_x_euler, offset_y_euler, offset_z_euler)
- ).as_matrix()
-
- original_gaze_fr_xyz = np.array([gaze_x, gaze_y, gaze_z])
-
- # rotate gaze vector by rotational offset to align pupil labs gaze with the eye sockets gaze
- gaze_rotated_by_guess_fr_xyz = [
- offset_rotation_matrix_guess @ original_gaze_fr_xyz[:, this_frame_number]
- for this_frame_number in range(original_gaze_fr_xyz.shape[1])
- ]
- gaze_rotated_by_guess_fr_xyz = np.array(gaze_rotated_by_guess_fr_xyz)
-
- # THEN rotate gaze vector by eye_socket_rotation_matrix to align it with the eye sockets gaze direction (i think)
- gaze_fr_xyz = [
- np.transpose(head_rotation_matricies[this_frame_number])
- @ gaze_rotated_by_guess_fr_xyz[this_frame_number, :]
- for this_frame_number in range(gaze_rotated_by_guess_fr_xyz.shape[0])
- ]
- gaze_fr_xyz = np.array(gaze_fr_xyz)
-
- # 6 - translate gaze vector back to the eye socket (by adding eyeball center xyz)
- gaze_laser_fr_xyz = np.empty(gaze_fr_xyz.shape)
- gaze_laser_fr_xyz[:, 0] = (
- gaze_fr_xyz[:, 0] + gaze_vector_start_point_fr_xyz[:, 0]
- )
- gaze_laser_fr_xyz[:, 1] = (
- gaze_fr_xyz[:, 1] + gaze_vector_start_point_fr_xyz[:, 1]
- )
- gaze_laser_fr_xyz[:, 2] = (
- gaze_fr_xyz[:, 2] + gaze_vector_start_point_fr_xyz[:, 2]
- )
-
- return gaze_laser_fr_xyz
diff --git a/src/qt_visualizer_and_gui/__init__.py b/src/qt_visualizer_and_gui/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/qt_visualizer_and_gui/qt_visualizer_and_gui.py b/src/qt_visualizer_and_gui/qt_visualizer_and_gui.py
deleted file mode 100644
index a82ecc84..00000000
--- a/src/qt_visualizer_and_gui/qt_visualizer_and_gui.py
+++ /dev/null
@@ -1,305 +0,0 @@
-import logging
-import time
-from typing import Dict
-
-import cv2
-import numpy as np
-import pyqtgraph as pg
-import pyqtgraph.opengl as gl
-from pyqtgraph.dockarea.Dock import Dock
-from pyqtgraph.dockarea.DockArea import DockArea
-from pyqtgraph.Qt import QtWidgets
-from mediapipe.python.solutions import holistic as mp_holistic
-
-from src.core_processes.timestamp_manager.timestamp_manager import TimestampManager
-from src.pipelines.session_pipeline.data_classes.data_3d_single_frame_payload import (
- Data3dMultiFramePayload,
-)
-
-logger = logging.getLogger(__name__)
-
-
-class QTVisualizerAndGui:
- def __init__(self):
- # https://pyqtgraph.readthedocs.io/en/latest/config_options.html
- self._skeleton_connections_list = None
- self._mediapipe_skeleton_initialized = False
- self.pyqtgraph_app = pg.mkQApp("freemocap! :D")
- pg.setConfigOptions(imageAxisOrder="row-major")
-
- self._dict_of_camera_image_item_widgets = {}
- self._number_of_cameras = None
- self._webcam_ids_list = []
- self._camera_set = False
-
- self._is_paused = False
- self._shut_it_down = False
- self._record_video_bool = False
-
- @property
- def shut_it_down(self):
- return self._shut_it_down
-
- @property
- def pause_button_pressed(self):
- return self._is_paused
-
- @property
- def record_button_pressed(self):
- return self._record_video_bool
-
- def _close_button_pressed(self):
- self.close()
- self._shut_it_down = True
-
- def close(self):
- self._main_window_widget.close()
-
- def setup_and_launch(self, webcam_ids_list):
- logger.info("setting up QT Visualizer and GUI")
- self._number_of_cameras = len(webcam_ids_list)
- self._webcam_ids_list = webcam_ids_list
- self._setup_main_window()
- self._setup_control_panel()
- self._setup_camera_views_dock()
- self._setup_3d_viewport()
- logger.info("launching QT Visualizer and GUI window")
-
- self._main_window_widget.show()
-
- def update_camera_view_image(self, webcam_id, image_to_display):
- if self.pause_button_pressed:
- return
-
- try:
- camera_image_item_widget = self._dict_of_camera_image_item_widgets[
- webcam_id
- ]
- except Exception as e:
- logger.warning(f"Could not find ViewBoxWidget for camera {webcam_id}")
- raise e
- camera_image_item_widget.setImage(
- cv2.cvtColor(image_to_display, cv2.COLOR_BGR2RGB)
- )
-
- def _setup_main_window(self, window_width: int = 1000, window_height: int = 1000):
- """
- This is the icis_conference_main icis_conference_main window for the GUI.
- Its structure is based loosely on the 'Dock Widgets' example from `python -m pyqtgraph.examples`
- """
- self._main_window_widget = QtWidgets.QMainWindow()
- self._main_window_widget.resize(window_width, window_height)
-
- self._main_dock_area = DockArea()
- self._main_window_widget.setCentralWidget(self._main_dock_area)
- self._main_window_widget.setWindowTitle("Main Window ;D")
-
- def _setup_control_panel(self):
- self._control_panel_dock = Dock("Control Panel", size=(1, 1))
- control_panel_layout_widget = pg.LayoutWidget()
- self._control_panel_dock.addWidget(control_panel_layout_widget)
-
- label = QtWidgets.QLabel("Blah Blah Blah put words here ")
- control_panel_layout_widget.addWidget(label, row=0, col=0)
-
- self._pause_button = QtWidgets.QPushButton("Pause")
- self._pause_button.setEnabled(True)
- self._pause_button.clicked.connect(self._pause)
- control_panel_layout_widget.addWidget(self._pause_button, row=1, col=0)
-
- self._play_button = QtWidgets.QPushButton("Resume")
- self._play_button.setEnabled(False)
- self._play_button.clicked.connect(self._play)
- control_panel_layout_widget.addWidget(self._play_button, row=2, col=0)
-
- # self._reset_calibration_button = QtWidgets.QPushButton('Reset Calibration')
- # self._reset_calibration_button.setEnabled(False)
- # self._reset_calibration_button.clicked.connect(self._reset_calibration)
- # control_panel_layout_widget.addWidget(self._reset_calibration_button, row=3, col=0)
- #
- self._start_record_button = QtWidgets.QPushButton("Start Recording Video")
- self._start_record_button.setEnabled(True)
- self._start_record_button.clicked.connect(self._record_button_pressed)
- control_panel_layout_widget.addWidget(self._start_record_button, row=3, col=0)
-
- self._close_button = QtWidgets.QPushButton("Close All")
- self._close_button.setEnabled(True)
- self._close_button.clicked.connect(self._close_button_pressed)
- control_panel_layout_widget.addWidget(self._close_button, row=4, col=0)
-
- self._main_dock_area.addDock(self._control_panel_dock, position="left")
-
- def _setup_camera_views_dock(self):
- self._camera_graphics_layout_window = pg.GraphicsLayoutWidget()
- self._camera_views_dock = Dock("Camera Views")
- self._camera_views_dock.addWidget(self._camera_graphics_layout_window)
- self._main_dock_area.addDock(
- self._camera_views_dock, "right", self._control_panel_dock
- )
-
- for this_webcam_id in self._webcam_ids_list:
- self._dict_of_camera_image_item_widgets[
- this_webcam_id
- ] = self._create_camera_view_widget()
-
- def _create_camera_view_widget(self):
- camera_view_box_widget = pg.ViewBox(invertY=True, lockAspect=True)
- camera_image_item = pg.ImageItem()
- camera_view_box_widget.addItem(camera_image_item)
- self._camera_graphics_layout_window.addItem(camera_view_box_widget)
- return camera_image_item
-
- def _pause(self):
- self._is_paused = True
- self._play_button.setEnabled(True)
- self._play_button.setText("GUI Paused - Main loop still active")
- self._pause_button.setEnabled(False)
-
- def _play(self):
- self._is_paused = False
- self._play_button.setEnabled(False)
- self._pause_button.setEnabled(True)
-
- def _reset_calibration(self):
- pass
-
- def _record_button_pressed(self):
- if not self._record_video_bool: # we want to start recording
- self._record_video_bool = True
- self._start_record_button.setText("Recording! Click Again to stop")
- else:
- self._record_video_bool = False
- self._start_record_button.setText(
- "Click to record more, or click Close All to stop"
- )
-
- def _setup_3d_viewport(self):
- self.opengl_3d_plot_widget = gl.GLViewWidget()
-
- # self.opengl_3d_plot_widget.opts['center'] = (0,0,0)
- self.opengl_3d_plot_widget.opts["distance"] = 2e3
- # self.opengl_3d_plot_widget.opts['azimuth'] = 0
- # self.opengl_3d_plot_widget.opts['elevation'] = 0
-
- self.create_grid_planes()
-
- # create XYZ axes
- x_axis_line_array = np.array([[0, 0, 0], [100, 0, 0]])
- y_axis_line_array = np.array([[0, 0, 0], [0, 100, 0]])
- z_axis_line_array = np.array([[0, 0, 0], [0, 0, 100]])
-
- self.origin_x_axis_gl_lineplot_item = pg.opengl.GLLinePlotItem(
- pos=x_axis_line_array, color=(1, 0, 0, 1), width=1.0, antialias=True
- )
- self.origin_y_axis_gl_lineplot_item = pg.opengl.GLLinePlotItem(
- pos=y_axis_line_array, color=(0, 1, 0, 1), width=1.0, antialias=True
- )
- self.origin_z_axis_gl_lineplot_item = pg.opengl.GLLinePlotItem(
- pos=z_axis_line_array, color=(0, 0, 1, 1), width=1.0, antialias=True
- )
- self.opengl_3d_plot_widget.addItem(self.origin_x_axis_gl_lineplot_item)
- self.opengl_3d_plot_widget.addItem(self.origin_y_axis_gl_lineplot_item)
- self.opengl_3d_plot_widget.addItem(self.origin_z_axis_gl_lineplot_item)
-
- self.opengl_charuco_scatter_item = gl.GLScatterPlotItem(
- pos=(0, 0, 0), color=(1, 0, 1, 1), size=10, pxMode=False
- )
-
- self.opengl_3d_plot_widget.addItem(self.opengl_charuco_scatter_item)
-
- self.opengl_3d_plot_dock = Dock("3d View Port")
- self.opengl_3d_plot_dock.addWidget(self.opengl_3d_plot_widget)
- self._main_dock_area.addDock(
- self.opengl_3d_plot_dock, "bottom", self._camera_views_dock
- )
-
- def create_grid_planes(self):
- grid_scale = 2e3
- # create the background grids
- grid_plane_x = gl.GLGridItem()
- grid_plane_x.setSize(grid_scale, grid_scale, grid_scale)
- grid_plane_x.setSpacing(grid_scale / 10, grid_scale / 10, grid_scale / 10)
- grid_plane_x.rotate(90, 0, 1, 0)
- grid_plane_x.translate(-grid_scale, 0, 0)
- self.opengl_3d_plot_widget.addItem(grid_plane_x)
-
- grid_plane_y = gl.GLGridItem()
- grid_plane_y.setSize(grid_scale, grid_scale, grid_scale)
- grid_plane_y.setSpacing(grid_scale / 10, grid_scale / 10, grid_scale / 10)
- grid_plane_y.rotate(90, 1, 0, 0)
- grid_plane_y.translate(0, -grid_scale, 0)
- self.opengl_3d_plot_widget.addItem(grid_plane_y)
-
- grid_plane_z = gl.GLGridItem()
- grid_plane_z.setSize(grid_scale, grid_scale, grid_scale)
- grid_plane_z.setSpacing(grid_scale / 10, grid_scale / 10, grid_scale / 10)
- grid_plane_z.translate(0, 0, -grid_scale)
- self.opengl_3d_plot_widget.addItem(grid_plane_z)
-
- def initialize_charuco_dottos(self, number_of_charuco_corners: int):
- dummy_charuco_points = np.zeros((number_of_charuco_corners, 3))
- self._charuco_scatter_item = gl.GLScatterPlotItem(
- pos=dummy_charuco_points, color=(1, 1, 0, 1), size=20
- )
- self.opengl_3d_plot_widget.addItem(self._charuco_scatter_item)
-
- def update_charuco_3d_dottos(self, charuco_frame_payload: Data3dMultiFramePayload):
- # if not self._camera_set:
- # mean_xyz = np.nanmean(charuco_frame_payload.data3d_trackedPointNum_xyz,axis=0)
- # self.opengl_3d_plot_widget.pan(mean_xyz[0], mean_xyz[1], mean_xyz[2])
- # self._camera_set = True
-
- self.opengl_charuco_scatter_item.setData(
- pos=charuco_frame_payload.data3d_trackedPointNum_xyz
- )
-
- def get_mediapipe_connections(self):
- self.mediapipe_body_connections = [
- this_connection for this_connection in mp_holistic.POSE_CONNECTIONS
- ]
- self.mediapipe_hand_connections = [
- this_connection for this_connection in mp_holistic.HAND_CONNECTIONS
- ]
- self.mediapipe_face_connections = [
- this_connection for this_connection in mp_holistic.FACEMESH_TESSELATION
- ]
-
- def initialize_skel_dottos(self, mediapipe_trackedPoint_xyz: np.ndarray):
- self.skeleton_scatter_item = gl.GLScatterPlotItem(
- pos=mediapipe_trackedPoint_xyz, color=(0, 1, 1, 1), size=10, pxMode=False
- )
- self.opengl_3d_plot_widget.addItem(self.skeleton_scatter_item)
-
- def initialize_skel_lines(self, mediapipe_trackedPoint_xyz: np.ndarray):
- self._skeleton_connections_list = []
- for this_connection in self.mediapipe_body_connections:
- this_skel_line = gl.GLLinePlotItem(
- pos=mediapipe_trackedPoint_xyz[this_connection, :]
- )
- self._skeleton_connections_list.append(this_skel_line)
- self.opengl_3d_plot_widget.addItem(this_skel_line)
-
- def update_mediapipe3d_skeleton(self, mediapipe3d_multi_frame_payload):
- mediapipe3d_trackedPoint_xyz = (
- mediapipe3d_multi_frame_payload.data3d_trackedPointNum_xyz
- )
- if not self._mediapipe_skeleton_initialized:
- self.get_mediapipe_connections()
- self.initialize_skel_dottos(mediapipe3d_trackedPoint_xyz)
- self.initialize_skel_lines(mediapipe3d_trackedPoint_xyz)
- self._mediapipe_skeleton_initialized = True
-
- # skel dottos
- self.skeleton_scatter_item.setData(pos=mediapipe3d_trackedPoint_xyz)
-
- # skel lines
- for this_skeleton_line_number, this_connection in enumerate(
- self.mediapipe_body_connections
- ):
- self._skeleton_connections_list[this_skeleton_line_number].setData(
- pos=mediapipe3d_trackedPoint_xyz[this_connection, :]
- )
-
-
-if __name__ == "__main__":
- pass
diff --git a/src/sending_anonymous_user_info_to_places/send_pipedream_ping.py b/src/sending_anonymous_user_info_to_places/send_pipedream_ping.py
deleted file mode 100644
index 1bfadb44..00000000
--- a/src/sending_anonymous_user_info_to_places/send_pipedream_ping.py
+++ /dev/null
@@ -1,16 +0,0 @@
-import logging
-
-import requests
-
-logger = logging.getLogger(__name__)
-
-
-def send_pipedream_ping(pipe_dream_ping_dictionary):
- logger.info(
- f"sending anonymous ping to pipedream to let the devs know that someone is using this, which will allow us to secure more funding to support this project. This is the dictionary of info we're sending: \n {pipe_dream_ping_dictionary}"
- )
-
- r = requests.post(
- "https://eoivu13g86if0cp.m.pipedream.net",
- json={"pinged_string": pipe_dream_ping_dictionary},
- )
diff --git a/src/tests/__init__.py b/src/tests/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/tests/session_folder/test_session_folder.py b/src/tests/session_folder/test_session_folder.py
deleted file mode 100644
index bbfa883d..00000000
--- a/src/tests/session_folder/test_session_folder.py
+++ /dev/null
@@ -1,43 +0,0 @@
-from pathlib import Path
-from typing import Union
-from unittest import TestCase
-
-import cv2
-
-from src.config.home_dir import (
- SYNCHRONIZED_VIDEOS_FOLDER_NAME,
- OUTPUT_DATA_FOLDER_NAME,
- MEDIAPIPE_2D_NPY_FILE_NAME,
-)
-
-
-class SessionFolderTestCase(TestCase):
- pass
- # def __init__(self, session_folder_path: Union[str, Path]):
- # super().__init__()
- # self._session_folder_path = session_folder_path
- #
- # # test folder structure
- # self._get_folder_names()
- # self._test_folders_exist()
- #
- # def _get_folder_names(self):
- #
- # self._synchronized_videos_folder = (
- # self._session_folder_path / SYNCHRONIZED_VIDEOS_FOLDER_NAME
- # )
- # self._output_data_folder = self._session_folder_path / OUTPUT_DATA_FOLDER_NAME
- #
- # # handle pre-alpha names
- # if not self._synchronized_videos_folder.exists():
- # self._synchronized_videos_folder = (
- # self._session_folder_path / "SyncedVideos"
- # )
- #
- # if not self._output_data_folder.exists():
- # self._output_data_folder = self._session_folder_path / "DataArrays"
- #
- # def _test_folders_exist(self):
- # self.assertTrue(self._synchronized_videos_folder.exists())
- # self.assertTrue(self._output_data_folder.exists())
- #
diff --git a/src/tests/test_mediapipe_data.py b/src/tests/test_mediapipe_data.py
deleted file mode 100644
index e1eab4cd..00000000
--- a/src/tests/test_mediapipe_data.py
+++ /dev/null
@@ -1,104 +0,0 @@
-from pathlib import Path
-from typing import Union
-
-import cv2
-import numpy as np
-
-from src.config.home_dir import (
- MEDIAPIPE_3D_NPY_FILE_NAME,
- MEDIAPIPE_REPROJECTION_ERROR_NPY_FILE_NAME,
- MEDIAPIPE_2D_NPY_FILE_NAME,
-)
-
-
-def test_mediapipe_2d_data(
- synchronized_videos_folder: Union[str, Path],
- path_to_folder_where_data_is_saved: Union[str, Path],
- mediapipe_2d_data: np.ndarray,
-):
-
- """
- test that the `mediapipe 2d detection` process worked correctly by checking:
-
- 1. There is an `.npy` file containing the mediapipe 2d data in the `output_data_folder`
- 2. The dimensions of that `npy` (number of cameras, number of frames, [ need to do - number of tracked points], [pixelX, pixelY] matches the videos in the `synchronized videos` folder
-
- TODO - check number of tracked points vs 'expected' number of tracked points
- """
-
- mediapipe_2d_data_file_path = (
- path_to_folder_where_data_is_saved / MEDIAPIPE_2D_NPY_FILE_NAME
- )
- assert mediapipe_2d_data_file_path.exists()
-
- saved_mediapipe_2d_data = np.load(mediapipe_2d_data_file_path)
- assert np.array_equal(saved_mediapipe_2d_data, mediapipe_2d_data, equal_nan=True)
-
- list_of_video_paths = list(synchronized_videos_folder.glob("*.mp4"))
- number_of_videos = len(list_of_video_paths)
- assert mediapipe_2d_data.shape[0] == number_of_videos
-
- video_0_cv2_capture_object = cv2.VideoCapture(str(list_of_video_paths[0]))
-
- number_of_frames_in_video_0 = int(
- video_0_cv2_capture_object.get(cv2.CAP_PROP_FRAME_COUNT)
- )
- assert mediapipe_2d_data.shape[1] == number_of_frames_in_video_0
-
- # TODO - check number of tracked points vs 'expected' number of tracked points
-
- assert mediapipe_2d_data.shape[3] == 2
-
- return True
-
-
-def test_mediapipe_3d_data(
- synchronized_videos_folder: Union[str, Path],
- path_to_folder_where_data_is_saved: Union[str, Path],
- skel3d_frame_marker_xyz: np.ndarray,
- skeleton_reprojection_error_fr_mar: np.ndarray,
-):
- """
- test that the `mediapipe 3d detection` process worked correctly by checking:
-
- 1. There is an `.npy` file containing the mediapipe 3d data in the `output_data_folder`
- 2. The dimensions of that `npy` ( number of frames, [ need to do - number of tracked points], [X,Y,Z] matches the videos in the `synchronized videos` folder
-
- TODO - check number of tracked points vs 'expected' number of tracked points
- """
-
- mediapipe_3d_spatial_data_file_path = (
- path_to_folder_where_data_is_saved / MEDIAPIPE_3D_NPY_FILE_NAME
- )
- assert (
- mediapipe_3d_spatial_data_file_path.exists()
- ), f"3d skeleton data file does not exist at {mediapipe_3d_spatial_data_file_path}"
-
- saved_spatial_data = np.load(mediapipe_3d_spatial_data_file_path)
- assert np.array_equal(saved_spatial_data, skel3d_frame_marker_xyz, equal_nan=True)
-
- mediapipe_reprojection_error_file_path = (
- path_to_folder_where_data_is_saved / MEDIAPIPE_REPROJECTION_ERROR_NPY_FILE_NAME
- )
- assert mediapipe_reprojection_error_file_path.exists()
-
- saved_reprojection_error = np.load(mediapipe_reprojection_error_file_path)
- assert np.array_equal(
- saved_reprojection_error, skeleton_reprojection_error_fr_mar, equal_nan=True
- )
-
- list_of_video_paths = list(synchronized_videos_folder.glob("*.mp4"))
-
- video_0_cv2_capture_object = cv2.VideoCapture(str(list_of_video_paths[0]))
-
- number_of_frames_in_video_0 = int(
- video_0_cv2_capture_object.get(cv2.CAP_PROP_FRAME_COUNT)
- )
- assert skel3d_frame_marker_xyz.shape[0] == number_of_frames_in_video_0
- assert skeleton_reprojection_error_fr_mar.shape[0] == number_of_frames_in_video_0
-
- # TODO - check number of tracked points vs 'expected' number of tracked points
-
- assert skel3d_frame_marker_xyz.shape[2] == 3
-
- return True
diff --git a/src/tests/video_writer/test_video_writer.py b/src/tests/video_writer/test_video_writer.py
deleted file mode 100644
index dab82fe9..00000000
--- a/src/tests/video_writer/test_video_writer.py
+++ /dev/null
@@ -1,29 +0,0 @@
-import os
-import shutil
-import time
-from pathlib import Path
-from unittest import TestCase
-
-import numpy as np
-
-from src.cameras.capture.dataclasses.frame_payload import FramePayload
-from src.cameras.persistence.video_writer.video_recorder import VideoRecorder
-
-
-class VideoWriterTestCase(TestCase):
- def setUp(self):
- self.test_folder = Path().joinpath("madeupvideowritertestingfolder").resolve()
-
- def tearDown(self):
- if os.path.exists(self.test_folder):
- shutil.rmtree(self.test_folder)
-
- def test_write_on_video_writer(self):
- example_payload = FramePayload(
- image=np.random.randint(0, 4, (720, 1280, 3)),
- timestamp_in_seconds_from_record_start=time.time_ns(),
- )
- vw = VideoRecorder("nothing", 100, 100, "nothing")
- vw.append_frame_payload_to_list(example_payload)
-
- assert vw.frame_count == 1
diff --git a/src/utils/__init__.py b/src/utils/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/utils/check_camera_connections.py b/src/utils/check_camera_connections.py
deleted file mode 100644
index 2365a53d..00000000
--- a/src/utils/check_camera_connections.py
+++ /dev/null
@@ -1,30 +0,0 @@
-import cv2
-import time
-
-NUMBER_OF_USB_PORTS_TO_CHECK = 20
-NUMBER_OF_FRAMES_TO_GRAB = 10
-
-for port_number in range(NUMBER_OF_USB_PORTS_TO_CHECK):
- cap = cv2.VideoCapture(port_number)
- time_start = time.perf_counter()
- success, image = cap.read()
- time_end = time.perf_counter()
- time_elapsed = time_end - time_start
- print(
- f"Trying to read an image from port {port_number} took {time_elapsed:.3} seconds and yielded: success={success}, image.__class__ ={image.__class__}"
- )
- if success:
- for frame_number in range(NUMBER_OF_FRAMES_TO_GRAB):
- try:
-
- time_start = time.perf_counter()
- success, image = cap.read()
- time_end = time.perf_counter()
- time_elapsed = time_end - time_start
- print(
- f"Camera port: {port_number}, Capture Object: {cap}, Frame# {frame_number}, frame grab duration: {time_elapsed:.3f} seconds, image.shape:{image.shape}"
- )
- except Exception as e:
- print(e)
- raise e
- cap.release()
diff --git a/src/utils/get_canonical_time_str.py b/src/utils/get_canonical_time_str.py
deleted file mode 100644
index bd35e428..00000000
--- a/src/utils/get_canonical_time_str.py
+++ /dev/null
@@ -1 +0,0 @@
-import time
diff --git a/versioneer.py b/versioneer.py
deleted file mode 100644
index 70958ce6..00000000
--- a/versioneer.py
+++ /dev/null
@@ -1,1885 +0,0 @@
-# Version: 0.18
-
-"""The Versioneer - like a rocketeer, but for versions.
-
-The Versioneer
-==============
-
-* like a rocketeer, but for versions!
-* https://github.com/warner/python-versioneer
-* Brian Warner
-* License: Public Domain
-* Compatible With: python2.6, 2.7, 3.2, 3.3, 3.4, 3.5, 3.6, and pypy
-* [![Latest Version]
-(https://pypip.in/version/versioneer/badge.svg?style=flat)
-](https://pypi.python.org/pypi/versioneer/)
-* [![Build Status]
-(https://travis-ci.org/warner/python-versioneer.png?branch=master)
-](https://travis-ci.org/warner/python-versioneer)
-
-This is a tool for managing a recorded version number in distutils-based
-python projects. The goal is to remove the tedious and error-prone "update
-the embedded version string" step from your release process. Making a new
-release should be as easy as recording a new tag in your version-control
-system, and maybe making new tarballs.
-
-
-## Quick Install
-
-* `pip install versioneer` to somewhere to your $PATH
-* add a `[versioneer]` section to your setup.cfg (see below)
-* calculate_center_of_mass `versioneer install` in your source tree, commit the results
-
-## Version Identifiers
-
-Source trees come from a variety of places:
-
-* a version-control system checkout (mostly used by developers)
-* a nightly tarball, produced by build automation
-* a snapshot tarball, produced by a web-based VCS browser, like github's
- "tarball from tag" feature
-* a release tarball, produced by "setup.py sdist", distributed through PyPI
-
-Within each source tree, the version identifier (either a string or a number,
-this tool is format-agnostic) can come from a variety of places:
-
-* ask the VCS tool itself, e.g. "git describe" (for checkouts), which knows
- about recent "tags" and an absolute revision-id
-* the name of the directory into which the tarball was unpacked
-* an expanded VCS keyword ($Id$, etc)
-* a `_version.py` created by some earlier build step
-
-For released software, the version identifier is closely related to a VCS
-tag. Some projects use tag names that include more than just the version
-string (e.g. "myproject-1.2" instead of just "1.2"), in which case the tool
-needs to strip the tag prefix to extract the version identifier. For
-unreleased software (between tags), the version identifier should provide
-enough information to help developers recreate the same tree, while also
-giving them an idea of roughly how old the tree is (after version 1.2, before
-version 1.3). Many VCS systems can report a description that captures this,
-for example `git describe --tags --dirty --always` reports things like
-"0.7-1-g574ab98-dirty" to indicate that the checkout is one revision past the
-0.7 tag, has a unique revision id of "574ab98", and is "dirty" (it has
-uncommitted changes.
-
-The version identifier is used for multiple purposes:
-
-* to allow the module to self-identify its version: `myproject.__version__`
-* to choose a name and prefix for a 'setup.py sdist' tarball
-
-## Theory of Operation
-
-Versioneer works by adding a special `_version.py` file into your source
-tree, where your `__init__.py` can import it. This `_version.py` knows how to
-dynamically ask the VCS tool for version information at import time.
-
-`_version.py` also contains `$Revision$` markers, and the installation
-process marks `_version.py` to have this marker rewritten with a tag name
-during the `git archive` command. As a result, generated tarballs will
-contain enough information to get the proper version.
-
-To allow `setup.py` to compute a version too, a `versioneer.py` is added to
-the top level of your source tree, next to `setup.py` and the `setup.cfg`
-that configures it. This overrides several distutils/setuptools commands to
-compute the version when invoked, and changes `setup.py build` and `setup.py
-sdist` to replace `_version.py` with a small static file that contains just
-the generated version data.
-
-## Installation
-
-See [INSTALL.md](./INSTALL.md) for detailed installation instructions.
-
-## Version-String Flavors
-
-Code which uses Versioneer can learn about its version string at runtime by
-importing `_version` from your icis_conference_main `__init__.py` file and running the
-`get_versions()` function. From the "outside" (e.g. in `setup.py`), you can
-import the top-level `versioneer.py` and calculate_center_of_mass `get_versions()`.
-
-Both functions return a dictionary with different flavors of version
-information:
-
-* `['version']`: A condensed version string, rendered using the selected
- style. This is the most commonly used value for the project's version
- string. The default "pep440" style yields strings like `0.11`,
- `0.11+2.g1076c97`, or `0.11+2.g1076c97.dirty`. See the "Styles" section
- below for alternative styles.
-
-* `['full-revisionid']`: detailed revision identifier. For Git, this is the
- full SHA1 commit id, e.g. "1076c978a8d3cfc70f408fe5974aa6c092c949ac".
-
-* `['date']`: Date and time of the latest `HEAD` commit. For Git, it is the
- commit date in ISO 8601 format. This will be None if the date is not
- available.
-
-* `['dirty']`: a boolean, True if the tree has uncommitted changes. Note that
- this is only accurate if calculate_center_of_mass in a VCS checkout, otherwise it is likely to
- be False or None
-
-* `['error']`: if the version string could not be computed, this will be set
- to a string describing the problem, otherwise it will be None. It may be
- useful to throw an exception in setup.py if this is set, to avoid e.g.
- creating tarballs with a version string of "unknown".
-
-Some variants are more useful than others. Including `full-revisionid` in a
-bug report should allow developers to reconstruct the exact code being tested
-(or indicate the presence of local changes that should be shared with the
-developers). `version` is suitable for display in an "about" box or a CLI
-`--version` output: it can be easily compared against release notes and lists
-of bugs fixed in various releases.
-
-The installer adds the following text to your `__init__.py` to place a basic
-version in `YOURPROJECT.__version__`:
-
- from ._version import get_versions
- __version__ = get_versions()['version']
- del get_versions
-
-## Styles
-
-The setup.cfg `style=` configuration controls how the VCS information is
-rendered into a version string.
-
-The default style, "pep440", produces a PEP440-compliant string, equal to the
-un-prefixed tag name for actual releases, and containing an additional "local
-version" section with more detail for in-between builds. For Git, this is
-TAG[+DISTANCE.gHEX[.dirty]] , using information from `git describe --tags
---dirty --always`. For example "0.11+2.g1076c97.dirty" indicates that the
-tree is like the "1076c97" commit but has uncommitted changes (".dirty"), and
-that this commit is two revisions ("+2") beyond the "0.11" tag. For released
-software (exactly equal to a known tag), the identifier will only contain the
-stripped tag, e.g. "0.11".
-
-Other styles are available. See [details.md](details.md) in the Versioneer
-source tree for descriptions.
-
-## Debugging
-
-Versioneer tries to avoid fatal errors: if something goes wrong, it will tend
-to return a version of "0+unknown". To investigate the problem, calculate_center_of_mass `setup.py
-version`, which will calculate_center_of_mass the version-lookup code in a verbose mode, and will
-display the full contents of `get_versions()` (including the `error` string,
-which may help identify what went wrong).
-
-## Known Limitations
-
-Some situations are known to cause problems for Versioneer. This details the
-most significant ones. More can be found on Github
-[issues page](https://github.com/warner/python-versioneer/issues).
-
-### Subprojects
-
-Versioneer has limited support for source trees in which `setup.py` is not in
-the root directory (e.g. `setup.py` and `.git/` are *not* siblings). The are
-two common reasons why `setup.py` might not be in the root:
-
-* Source trees which contain multiple subprojects, such as
- [Buildbot](https://github.com/buildbot/buildbot), which contains both
- "master" and "slave" subprojects, each with their own `setup.py`,
- `setup.cfg`, and `tox.ini`. Projects like these produce multiple PyPI
- distributions (and upload multiple independently-installable tarballs).
-* Source trees whose icis_conference_main purpose is to contain a C library, but which also
- provide bindings to Python (and perhaps other langauges) in subdirectories.
-
-Versioneer will look for `.git` in parent directories, and most operations
-should get the right version string. However `pip` and `setuptools` have bugs
-and implementation details which frequently cause `pip install .` from a
-subproject directory to fail to find a correct version string (so it usually
-defaults to `0+unknown`).
-
-`pip install --editable .` should work correctly. `setup.py install` might
-work too.
-
-Pip-8.1.1 is known to have this problem, but hopefully it will get fixed in
-some later version.
-
-[Bug #38](https://github.com/warner/python-versioneer/issues/38) is tracking
-this issue. The discussion in
-[PR #61](https://github.com/warner/python-versioneer/pull/61) describes the
-issue from the Versioneer side in more detail.
-[pip PR#3176](https://github.com/pypa/pip/pull/3176) and
-[pip PR#3615](https://github.com/pypa/pip/pull/3615) contain work to improve
-pip to let Versioneer work correctly.
-
-Versioneer-0.16 and earlier only looked for a `.git` directory next to the
-`setup.cfg`, so subprojects were completely unsupported with those releases.
-
-### Editable installs with setuptools <= 18.5
-
-`setup.py develop` and `pip install --editable .` allow you to install a
-project into a virtualenv once, then continue editing the source code (and
-test) without re-installing after every change.
-
-"Entry-point scripts" (`setup(entry_points={"console_scripts": ..})`) are a
-convenient way to specify executable scripts that should be installed along
-with the python package.
-
-These both work as expected when using modern setuptools. When using
-setuptools-18.5 or earlier, however, certain operations will cause
-`pkg_resources.DistributionNotFound` errors when running the entrypoint
-script, which must be resolved by re-installing the package. This happens
-when the install happens with one version, then the egg_info data is
-regenerated while a different version is checked out. Many setup.py commands
-cause egg_info to be rebuilt (including `sdist`, `wheel`, and installing into
-a different virtualenv), so this can be surprising.
-
-[Bug #83](https://github.com/warner/python-versioneer/issues/83) describes
-this one, but upgrading to a newer version of setuptools should probably
-resolve it.
-
-### Unicode version strings
-
-While Versioneer works (and is continually tested) with both Python 2 and
-Python 3, it is not entirely consistent with bytes-vs-unicode distinctions.
-Newer releases probably generate unicode version strings on py2. It's not
-clear that this is wrong, but it may be surprising for applications when then
-write these strings to a network connection or include them in bytes-oriented
-APIs like cryptographic checksums.
-
-[Bug #71](https://github.com/warner/python-versioneer/issues/71) investigates
-this question.
-
-
-## Updating Versioneer
-
-To upgrade your project to a new release of Versioneer, do the following:
-
-* install the new Versioneer (`pip install -U versioneer` or equivalent)
-* edit `setup.cfg`, if necessary, to include any new configuration settings
- indicated by the release notes. See [UPGRADING](./UPGRADING.md) for details.
-* re-calculate_center_of_mass `versioneer install` in your source tree, to replace
- `SRC/_version.py`
-* commit any changed files
-
-## Future Directions
-
-This tool is designed to make it easily extended to other version-control
-systems: all VCS-specific components are in separate directories like
-src/git/ . The top-level `versioneer.py` script is assembled from these
-components by running make-versioneer.py . In the future, make-versioneer.py
-will take a VCS name as an argument, and will construct a version of
-`versioneer.py` that is specific to the given VCS. It might also take the
-configuration arguments that are currently provided manually during
-installation by editing setup.py . Alternatively, it might go the other
-direction and include code from all supported VCS systems, reducing the
-number of intermediate scripts.
-
-
-## License
-
-To make Versioneer easier to embed, all its code is dedicated to the public
-domain. The `_version.py` that it creates is also in the public domain.
-Specifically, both are released under the Creative Commons "Public Domain
-Dedication" license (CC0-1.0), as described in
-https://creativecommons.org/publicdomain/zero/1.0/ .
-
-"""
-
-from __future__ import print_function
-
-try:
- import configparser
-except ImportError:
- import ConfigParser as configparser
-import errno
-import json
-import os
-import re
-import subprocess
-import sys
-
-
-class VersioneerConfig:
- """Container for Versioneer configuration parameters."""
-
-
-def get_root():
- """Get the project root directory.
-
- We require that all commands are calculate_center_of_mass from the project root, i.e. the
- directory that contains setup.py, setup.cfg, and versioneer.py .
- """
- root = os.path.realpath(os.path.abspath(os.getcwd()))
- setup_py = os.path.join(root, "setup.py")
- versioneer_py = os.path.join(root, "versioneer.py")
- if not (os.path.exists(setup_py) or os.path.exists(versioneer_py)):
- # allow 'python path/to/setup.py COMMAND'
- root = os.path.dirname(os.path.realpath(os.path.abspath(sys.argv[0])))
- setup_py = os.path.join(root, "setup.py")
- versioneer_py = os.path.join(root, "versioneer.py")
- if not (os.path.exists(setup_py) or os.path.exists(versioneer_py)):
- err = (
- "Versioneer was unable to calculate_center_of_mass the project root directory. "
- "Versioneer requires setup.py to be executed from "
- "its immediate directory (like 'python setup.py COMMAND'), "
- "or in a way that lets it use sys.argv[0] to find the root "
- "(like 'python path/to/setup.py COMMAND')."
- )
- raise VersioneerBadRootError(err)
- try:
- # Certain runtime workflows (setup.py install/develop in a setuptools
- # tree) execute all dependencies in a single python process, so
- # "versioneer" may be imported multiple times, and python's shared
- # module-import table will cache the first one. So we can't use
- # os.path.dirname(__file__), as that will find whichever
- # versioneer.py was first imported, even in later projects.
- me = os.path.realpath(os.path.abspath(__file__))
- me_dir = os.path.normcase(os.path.splitext(me)[0])
- vsr_dir = os.path.normcase(os.path.splitext(versioneer_py)[0])
- if me_dir != vsr_dir:
- print(
- "Warning: build in %s is using versioneer.py from %s"
- % (os.path.dirname(me), versioneer_py)
- )
- except NameError:
- pass
- return root
-
-
-def get_config_from_root(root):
- """Read the project setup.cfg file to determine Versioneer config."""
- # This might raise EnvironmentError (if setup.cfg is missing), or
- # configparser.NoSectionError (if it lacks a [versioneer] section), or
- # configparser.NoOptionError (if it lacks "VCS="). See the docstring at
- # the top of versioneer.py for instructions on writing your setup.cfg .
- setup_cfg = os.path.join(root, "setup.cfg")
- parser = configparser.SafeConfigParser()
- with open(setup_cfg, "r") as f:
- parser.readfp(f)
- VCS = parser.get("versioneer", "VCS") # mandatory
-
- def get(parser, name):
- if parser.has_option("versioneer", name):
- return parser.get("versioneer", name)
- return None
-
- cfg = VersioneerConfig()
- cfg.VCS = VCS
- cfg.style = get(parser, "style") or ""
- cfg.versionfile_source = get(parser, "versionfile_source")
- cfg.versionfile_build = get(parser, "versionfile_build")
- cfg.tag_prefix = get(parser, "tag_prefix")
- if cfg.tag_prefix in ("''", '""'):
- cfg.tag_prefix = ""
- cfg.parentdir_prefix = get(parser, "parentdir_prefix")
- cfg.verbose = get(parser, "verbose")
- return cfg
-
-
-class NotThisMethod(Exception):
- """Exception raised if a method is not valid for the current scenario."""
-
-
-# these dictionaries contain VCS-specific tools
-LONG_VERSION_PY = {}
-HANDLERS = {}
-
-
-def register_vcs_handler(vcs, method): # decorator
- """Decorator to mark a method as the handler for a particular VCS."""
-
- def decorate(f):
- """Store f in HANDLERS[vcs][method]."""
- if vcs not in HANDLERS:
- HANDLERS[vcs] = {}
- HANDLERS[vcs][method] = f
- return f
-
- return decorate
-
-
-def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, env=None):
- """Call the given command(s)."""
- assert isinstance(commands, list)
- p = None
- for c in commands:
- try:
- dispcmd = str([c] + args)
- # remember shell=False, so use git.cmd on windows, not just git
- p = subprocess.Popen(
- [c] + args,
- cwd=cwd,
- env=env,
- stdout=subprocess.PIPE,
- stderr=(subprocess.PIPE if hide_stderr else None),
- )
- break
- except EnvironmentError:
- e = sys.exc_info()[1]
- if e.errno == errno.ENOENT:
- continue
- if verbose:
- print("unable to calculate_center_of_mass %s" % dispcmd)
- print(e)
- return None, None
- else:
- if verbose:
- print("unable to find command, tried %s" % (commands,))
- return None, None
- stdout = p.communicate()[0].strip()
- if sys.version_info[0] >= 3:
- stdout = stdout.decode()
- if p.returncode != 0:
- if verbose:
- print("unable to calculate_center_of_mass %s (error)" % dispcmd)
- print("stdout was %s" % stdout)
- return None, p.returncode
- return stdout, p.returncode
-
-
-LONG_VERSION_PY[
- "git"
-] = '''
-# This file helps to compute a version number in source trees obtained from
-# git-archive tarball (such as those provided by githubs download-from-tag
-# feature). Distribution tarballs (built by setup.py sdist) and build
-# directories (produced by setup.py build) will contain a much shorter file
-# that just contains the computed version number.
-
-# This file is released into the public domain. Generated by
-# versioneer-0.18 (https://github.com/warner/python-versioneer)
-
-"""Git implementation of _version.py."""
-
-import errno
-import os
-import re
-import subprocess
-import sys
-
-
-def get_keywords():
- """Get the keywords needed to look up the version information."""
- # these strings will be replaced by git during git-archive.
- # setup.py/versioneer.py will grep for the variable names, so they must
- # each be defined on a line of their own. _version.py will just call
- # get_keywords().
- git_refnames = "%(DOLLAR)sFormat:%%d%(DOLLAR)s"
- git_full = "%(DOLLAR)sFormat:%%H%(DOLLAR)s"
- git_date = "%(DOLLAR)sFormat:%%ci%(DOLLAR)s"
- keywords = {"refnames": git_refnames, "full": git_full, "date": git_date}
- return keywords
-
-
-class VersioneerConfig:
- """Container for Versioneer configuration parameters."""
-
-
-def get_config():
- """Create, populate and return the VersioneerConfig() object."""
- # these strings are filled in when 'setup.py versioneer' creates
- # _version.py
- cfg = VersioneerConfig()
- cfg.VCS = "git"
- cfg.style = "%(STYLE)s"
- cfg.tag_prefix = "%(TAG_PREFIX)s"
- cfg.parentdir_prefix = "%(PARENTDIR_PREFIX)s"
- cfg.versionfile_source = "%(VERSIONFILE_SOURCE)s"
- cfg.verbose = False
- return cfg
-
-
-class NotThisMethod(Exception):
- """Exception raised if a method is not valid for the current scenario."""
-
-
-LONG_VERSION_PY = {}
-HANDLERS = {}
-
-
-def register_vcs_handler(vcs, method): # decorator
- """Decorator to mark a method as the handler for a particular VCS."""
- def decorate(f):
- """Store f in HANDLERS[vcs][method]."""
- if vcs not in HANDLERS:
- HANDLERS[vcs] = {}
- HANDLERS[vcs][method] = f
- return f
- return decorate
-
-
-def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False,
- env=None):
- """Call the given command(s)."""
- assert isinstance(commands, list)
- p = None
- for c in commands:
- try:
- dispcmd = str([c] + args)
- # remember shell=False, so use git.cmd on windows, not just git
- p = subprocess.Popen([c] + args, cwd=cwd, env=env,
- stdout=subprocess.PIPE,
- stderr=(subprocess.PIPE if hide_stderr
- else None))
- break
- except EnvironmentError:
- e = sys.exc_info()[1]
- if e.errno == errno.ENOENT:
- continue
- if verbose:
- print("unable to calculate_center_of_mass %%s" %% dispcmd)
- print(e)
- return None, None
- else:
- if verbose:
- print("unable to find command, tried %%s" %% (commands,))
- return None, None
- stdout = p.communicate()[0].strip()
- if sys.version_info[0] >= 3:
- stdout = stdout.decode()
- if p.returncode != 0:
- if verbose:
- print("unable to calculate_center_of_mass %%s (error)" %% dispcmd)
- print("stdout was %%s" %% stdout)
- return None, p.returncode
- return stdout, p.returncode
-
-
-def versions_from_parentdir(parentdir_prefix, root, verbose):
- """Try to determine the version from the parent directory name.
-
- Source tarballs conventionally unpack into a directory that includes both
- the project name and a version string. We will also support searching up
- two directory levels for an appropriately named parent directory
- """
- rootdirs = []
-
- for i in range(3):
- dirname = os.path.basename(root)
- if dirname.startswith(parentdir_prefix):
- return {"version": dirname[len(parentdir_prefix):],
- "full-revisionid": None,
- "dirty": False, "error": None, "date": None}
- else:
- rootdirs.append(root)
- root = os.path.dirname(root) # up a level
-
- if verbose:
- print("Tried directories %%s but none started with prefix %%s" %%
- (str(rootdirs), parentdir_prefix))
- raise NotThisMethod("rootdir doesn't start with parentdir_prefix")
-
-
-@register_vcs_handler("git", "get_keywords")
-def git_get_keywords(versionfile_abs):
- """Extract version information from the given file."""
- # the code embedded in _version.py can just fetch the value of these
- # keywords. When used from setup.py, we don't want to import _version.py,
- # so we do it with a regexp instead. This function is not used from
- # _version.py.
- keywords = {}
- try:
- f = open(versionfile_abs, "r")
- for line in f.readlines():
- if line.strip().startswith("git_refnames ="):
- mo = re.search(r'=\s*"(.*)"', line)
- if mo:
- keywords["refnames"] = mo.group(1)
- if line.strip().startswith("git_full ="):
- mo = re.search(r'=\s*"(.*)"', line)
- if mo:
- keywords["full"] = mo.group(1)
- if line.strip().startswith("git_date ="):
- mo = re.search(r'=\s*"(.*)"', line)
- if mo:
- keywords["date"] = mo.group(1)
- f.close()
- except EnvironmentError:
- pass
- return keywords
-
-
-@register_vcs_handler("git", "keywords")
-def git_versions_from_keywords(keywords, tag_prefix, verbose):
- """Get version information from git keywords."""
- if not keywords:
- raise NotThisMethod("no keywords at all, weird")
- date = keywords.get("date")
- if date is not None:
- # git-2.2.0 added "%%cI", which expands to an ISO-8601 -compliant
- # datestamp. However we prefer "%%ci" (which expands to an "ISO-8601
- # -like" string, which we must then edit to make compliant), because
- # it's been around since git-1.5.3, and it's too difficult to
- # discover which version we're using, or to work around using an
- # older one.
- date = date.strip().replace(" ", "T", 1).replace(" ", "", 1)
- refnames = keywords["refnames"].strip()
- if refnames.startswith("$Format"):
- if verbose:
- print("keywords are unexpanded, not using")
- raise NotThisMethod("unexpanded keywords, not a git-archive tarball")
- refs = set([r.strip() for r in refnames.strip("()").split(",")])
- # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of
- # just "foo-1.0". If we see a "tag: " prefix, prefer those.
- TAG = "tag: "
- tags = set([r[len(TAG):] for r in refs if r.startswith(TAG)])
- if not tags:
- # Either we're using git < 1.8.3, or there really are no tags. We use
- # a heuristic: assume all version tags have a digit. The old git %%d
- # expansion behaves like git log --decorate=short and strips out the
- # refs/heads/ and refs/tags/ prefixes that would let us distinguish
- # between branches and tags. By ignoring refnames without digits, we
- # filter out many common branch names like "release" and
- # "stabilization", as well as "HEAD" and "master".
- tags = set([r for r in refs if re.search(r'\d', r)])
- if verbose:
- print("discarding '%%s', no digits" %% ",".join(refs - tags))
- if verbose:
- print("likely tags: %%s" %% ",".join(sorted(tags)))
- for ref in sorted(tags):
- # sorting will prefer e.g. "2.0" over "2.0rc1"
- if ref.startswith(tag_prefix):
- r = ref[len(tag_prefix):]
- if verbose:
- print("picking %%s" %% r)
- return {"version": r,
- "full-revisionid": keywords["full"].strip(),
- "dirty": False, "error": None,
- "date": date}
- # no suitable tags, so version is "0+unknown", but full hex is still there
- if verbose:
- print("no suitable tags, using unknown + full revision id")
- return {"version": "0+unknown",
- "full-revisionid": keywords["full"].strip(),
- "dirty": False, "error": "no suitable tags", "date": None}
-
-
-@register_vcs_handler("git", "pieces_from_vcs")
-def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command):
- """Get version from 'git describe' in the root of the source tree.
-
- This only gets called if the git-archive 'subst' keywords were *not*
- expanded, and _version.py hasn't already been rewritten with a short
- version string, meaning we're inside a checked out source tree.
- """
- GITS = ["git"]
- if sys.platform == "win32":
- GITS = ["git.cmd", "git.exe"]
-
- out, rc = run_command(GITS, ["rev-parse", "--git-dir"], cwd=root,
- hide_stderr=True)
- if rc != 0:
- if verbose:
- print("Directory %%s not under git control" %% root)
- raise NotThisMethod("'git rev-parse --git-dir' returned error")
-
- # if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty]
- # if there isn't one, this yields HEX[-dirty] (no NUM)
- describe_out, rc = run_command(GITS, ["describe", "--tags", "--dirty",
- "--always", "--long",
- "--match", "%%s*" %% tag_prefix],
- cwd=root)
- # --long was added in git-1.5.5
- if describe_out is None:
- raise NotThisMethod("'git describe' failed")
- describe_out = describe_out.strip()
- full_out, rc = run_command(GITS, ["rev-parse", "HEAD"], cwd=root)
- if full_out is None:
- raise NotThisMethod("'git rev-parse' failed")
- full_out = full_out.strip()
-
- pieces = {}
- pieces["long"] = full_out
- pieces["short"] = full_out[:7] # maybe improved later
- pieces["error"] = None
-
- # parse describe_out. It will be like TAG-NUM-gHEX[-dirty] or HEX[-dirty]
- # TAG might have hyphens.
- git_describe = describe_out
-
- # look for -dirty suffix
- dirty = git_describe.endswith("-dirty")
- pieces["dirty"] = dirty
- if dirty:
- git_describe = git_describe[:git_describe.rindex("-dirty")]
-
- # now we have TAG-NUM-gHEX or HEX
-
- if "-" in git_describe:
- # TAG-NUM-gHEX
- mo = re.search(r'^(.+)-(\d+)-g([0-9a-f]+)$', git_describe)
- if not mo:
- # unparseable. Maybe git-describe is misbehaving?
- pieces["error"] = ("unable to parse git-describe output: '%%s'"
- %% describe_out)
- return pieces
-
- # tag
- full_tag = mo.group(1)
- if not full_tag.startswith(tag_prefix):
- if verbose:
- fmt = "tag '%%s' doesn't start with prefix '%%s'"
- print(fmt %% (full_tag, tag_prefix))
- pieces["error"] = ("tag '%%s' doesn't start with prefix '%%s'"
- %% (full_tag, tag_prefix))
- return pieces
- pieces["closest-tag"] = full_tag[len(tag_prefix):]
-
- # distance: number of commits since tag
- pieces["distance"] = int(mo.group(2))
-
- # commit: short hex revision ID
- pieces["short"] = mo.group(3)
-
- else:
- # HEX: no tags
- pieces["closest-tag"] = None
- count_out, rc = run_command(GITS, ["rev-list", "HEAD", "--count"],
- cwd=root)
- pieces["distance"] = int(count_out) # total number of commits
-
- # commit date: see ISO-8601 comment in git_versions_from_keywords()
- date = run_command(GITS, ["show", "-s", "--format=%%ci", "HEAD"],
- cwd=root)[0].strip()
- pieces["date"] = date.strip().replace(" ", "T", 1).replace(" ", "", 1)
-
- return pieces
-
-
-def plus_or_dot(pieces):
- """Return a + if we don't already have one, else return a ."""
- if "+" in pieces.get("closest-tag", ""):
- return "."
- return "+"
-
-
-def render_pep440(pieces):
- """Build up version string, with post-release "local version identifier".
-
- Our goal: TAG[+DISTANCE.gHEX[.dirty]] . Note that if you
- get a tagged build and then dirty it, you'll get TAG+0.gHEX.dirty
-
- Exceptions:
- 1: no tags. git_describe was just HEX. 0+untagged.DISTANCE.gHEX[.dirty]
- """
- if pieces["closest-tag"]:
- rendered = pieces["closest-tag"]
- if pieces["distance"] or pieces["dirty"]:
- rendered += plus_or_dot(pieces)
- rendered += "%%d.g%%s" %% (pieces["distance"], pieces["short"])
- if pieces["dirty"]:
- rendered += ".dirty"
- else:
- # exception #1
- rendered = "0+untagged.%%d.g%%s" %% (pieces["distance"],
- pieces["short"])
- if pieces["dirty"]:
- rendered += ".dirty"
- return rendered
-
-
-def render_pep440_pre(pieces):
- """TAG[.post.devDISTANCE] -- No -dirty.
-
- Exceptions:
- 1: no tags. 0.post.devDISTANCE
- """
- if pieces["closest-tag"]:
- rendered = pieces["closest-tag"]
- if pieces["distance"]:
- rendered += ".post.dev%%d" %% pieces["distance"]
- else:
- # exception #1
- rendered = "0.post.dev%%d" %% pieces["distance"]
- return rendered
-
-
-def render_pep440_post(pieces):
- """TAG[.postDISTANCE[.dev0]+gHEX] .
-
- The ".dev0" means dirty. Note that .dev0 sorts backwards
- (a dirty tree will appear "older" than the corresponding clean one),
- but you shouldn't be releasing software with -dirty anyways.
-
- Exceptions:
- 1: no tags. 0.postDISTANCE[.dev0]
- """
- if pieces["closest-tag"]:
- rendered = pieces["closest-tag"]
- if pieces["distance"] or pieces["dirty"]:
- rendered += ".post%%d" %% pieces["distance"]
- if pieces["dirty"]:
- rendered += ".dev0"
- rendered += plus_or_dot(pieces)
- rendered += "g%%s" %% pieces["short"]
- else:
- # exception #1
- rendered = "0.post%%d" %% pieces["distance"]
- if pieces["dirty"]:
- rendered += ".dev0"
- rendered += "+g%%s" %% pieces["short"]
- return rendered
-
-
-def render_pep440_old(pieces):
- """TAG[.postDISTANCE[.dev0]] .
-
- The ".dev0" means dirty.
-
- Eexceptions:
- 1: no tags. 0.postDISTANCE[.dev0]
- """
- if pieces["closest-tag"]:
- rendered = pieces["closest-tag"]
- if pieces["distance"] or pieces["dirty"]:
- rendered += ".post%%d" %% pieces["distance"]
- if pieces["dirty"]:
- rendered += ".dev0"
- else:
- # exception #1
- rendered = "0.post%%d" %% pieces["distance"]
- if pieces["dirty"]:
- rendered += ".dev0"
- return rendered
-
-
-def render_git_describe(pieces):
- """TAG[-DISTANCE-gHEX][-dirty].
-
- Like 'git describe --tags --dirty --always'.
-
- Exceptions:
- 1: no tags. HEX[-dirty] (note: no 'g' prefix)
- """
- if pieces["closest-tag"]:
- rendered = pieces["closest-tag"]
- if pieces["distance"]:
- rendered += "-%%d-g%%s" %% (pieces["distance"], pieces["short"])
- else:
- # exception #1
- rendered = pieces["short"]
- if pieces["dirty"]:
- rendered += "-dirty"
- return rendered
-
-
-def render_git_describe_long(pieces):
- """TAG-DISTANCE-gHEX[-dirty].
-
- Like 'git describe --tags --dirty --always -long'.
- The distance/hash is unconditional.
-
- Exceptions:
- 1: no tags. HEX[-dirty] (note: no 'g' prefix)
- """
- if pieces["closest-tag"]:
- rendered = pieces["closest-tag"]
- rendered += "-%%d-g%%s" %% (pieces["distance"], pieces["short"])
- else:
- # exception #1
- rendered = pieces["short"]
- if pieces["dirty"]:
- rendered += "-dirty"
- return rendered
-
-
-def render(pieces, style):
- """Render the given version pieces into the requested style."""
- if pieces["error"]:
- return {"version": "unknown",
- "full-revisionid": pieces.get("long"),
- "dirty": None,
- "error": pieces["error"],
- "date": None}
-
- if not style or style == "default":
- style = "pep440" # the default
-
- if style == "pep440":
- rendered = render_pep440(pieces)
- elif style == "pep440-pre":
- rendered = render_pep440_pre(pieces)
- elif style == "pep440-post":
- rendered = render_pep440_post(pieces)
- elif style == "pep440-old":
- rendered = render_pep440_old(pieces)
- elif style == "git-describe":
- rendered = render_git_describe(pieces)
- elif style == "git-describe-long":
- rendered = render_git_describe_long(pieces)
- else:
- raise ValueError("unknown style '%%s'" %% style)
-
- return {"version": rendered, "full-revisionid": pieces["long"],
- "dirty": pieces["dirty"], "error": None,
- "date": pieces.get("date")}
-
-
-def get_versions():
- """Get version information or return default if unable to do so."""
- # I am in _version.py, which lives at ROOT/VERSIONFILE_SOURCE. If we have
- # __file__, we can work backwards from there to the root. Some
- # py2exe/bbfreeze/non-CPython implementations don't do __file__, in which
- # case we can only use expanded keywords.
-
- cfg = get_config()
- verbose = cfg.verbose
-
- try:
- return git_versions_from_keywords(get_keywords(), cfg.tag_prefix,
- verbose)
- except NotThisMethod:
- pass
-
- try:
- root = os.path.realpath(__file__)
- # versionfile_source is the relative path from the top of the source
- # tree (where the .git directory might live) to this file. Invert
- # this to find the root from __file__.
- for i in cfg.versionfile_source.split('/'):
- root = os.path.dirname(root)
- except NameError:
- return {"version": "0+unknown", "full-revisionid": None,
- "dirty": None,
- "error": "unable to find root of source tree",
- "date": None}
-
- try:
- pieces = git_pieces_from_vcs(cfg.tag_prefix, root, verbose)
- return render(pieces, cfg.style)
- except NotThisMethod:
- pass
-
- try:
- if cfg.parentdir_prefix:
- return versions_from_parentdir(cfg.parentdir_prefix, root, verbose)
- except NotThisMethod:
- pass
-
- return {"version": "0+unknown", "full-revisionid": None,
- "dirty": None,
- "error": "unable to compute version", "date": None}
-'''
-
-
-@register_vcs_handler("git", "get_keywords")
-def git_get_keywords(versionfile_abs):
- """Extract version information from the given file."""
- # the code embedded in _version.py can just fetch the value of these
- # keywords. When used from setup.py, we don't want to import _version.py,
- # so we do it with a regexp instead. This function is not used from
- # _version.py.
- keywords = {}
- try:
- f = open(versionfile_abs, "r")
- for line in f.readlines():
- if line.strip().startswith("git_refnames ="):
- mo = re.search(r'=\s*"(.*)"', line)
- if mo:
- keywords["refnames"] = mo.group(1)
- if line.strip().startswith("git_full ="):
- mo = re.search(r'=\s*"(.*)"', line)
- if mo:
- keywords["full"] = mo.group(1)
- if line.strip().startswith("git_date ="):
- mo = re.search(r'=\s*"(.*)"', line)
- if mo:
- keywords["date"] = mo.group(1)
- f.close()
- except EnvironmentError:
- pass
- return keywords
-
-
-@register_vcs_handler("git", "keywords")
-def git_versions_from_keywords(keywords, tag_prefix, verbose):
- """Get version information from git keywords."""
- if not keywords:
- raise NotThisMethod("no keywords at all, weird")
- date = keywords.get("date")
- if date is not None:
- # git-2.2.0 added "%cI", which expands to an ISO-8601 -compliant
- # datestamp. However we prefer "%ci" (which expands to an "ISO-8601
- # -like" string, which we must then edit to make compliant), because
- # it's been around since git-1.5.3, and it's too difficult to
- # discover which version we're using, or to work around using an
- # older one.
- date = date.strip().replace(" ", "T", 1).replace(" ", "", 1)
- refnames = keywords["refnames"].strip()
- if refnames.startswith("$Format"):
- if verbose:
- print("keywords are unexpanded, not using")
- raise NotThisMethod("unexpanded keywords, not a git-archive tarball")
- refs = set([r.strip() for r in refnames.strip("()").split(",")])
- # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of
- # just "foo-1.0". If we see a "tag: " prefix, prefer those.
- TAG = "tag: "
- tags = set([r[len(TAG) :] for r in refs if r.startswith(TAG)])
- if not tags:
- # Either we're using git < 1.8.3, or there really are no tags. We use
- # a heuristic: assume all version tags have a digit. The old git %d
- # expansion behaves like git log --decorate=short and strips out the
- # refs/heads/ and refs/tags/ prefixes that would let us distinguish
- # between branches and tags. By ignoring refnames without digits, we
- # filter out many common branch names like "release" and
- # "stabilization", as well as "HEAD" and "master".
- tags = set([r for r in refs if re.search(r"\d", r)])
- if verbose:
- print("discarding '%s', no digits" % ",".join(refs - tags))
- if verbose:
- print("likely tags: %s" % ",".join(sorted(tags)))
- for ref in sorted(tags):
- # sorting will prefer e.g. "2.0" over "2.0rc1"
- if ref.startswith(tag_prefix):
- r = ref[len(tag_prefix) :]
- if verbose:
- print("picking %s" % r)
- return {
- "version": r,
- "full-revisionid": keywords["full"].strip(),
- "dirty": False,
- "error": None,
- "date": date,
- }
- # no suitable tags, so version is "0+unknown", but full hex is still there
- if verbose:
- print("no suitable tags, using unknown + full revision id")
- return {
- "version": "0+unknown",
- "full-revisionid": keywords["full"].strip(),
- "dirty": False,
- "error": "no suitable tags",
- "date": None,
- }
-
-
-@register_vcs_handler("git", "pieces_from_vcs")
-def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command):
- """Get version from 'git describe' in the root of the source tree.
-
- This only gets called if the git-archive 'subst' keywords were *not*
- expanded, and _version.py hasn't already been rewritten with a short
- version string, meaning we're inside a checked out source tree.
- """
- GITS = ["git"]
- if sys.platform == "win32":
- GITS = ["git.cmd", "git.exe"]
-
- out, rc = run_command(GITS, ["rev-parse", "--git-dir"], cwd=root, hide_stderr=True)
- if rc != 0:
- if verbose:
- print("Directory %s not under git control" % root)
- raise NotThisMethod("'git rev-parse --git-dir' returned error")
-
- # if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty]
- # if there isn't one, this yields HEX[-dirty] (no NUM)
- describe_out, rc = run_command(
- GITS,
- [
- "describe",
- "--tags",
- "--dirty",
- "--always",
- "--long",
- "--match",
- "%s*" % tag_prefix,
- ],
- cwd=root,
- )
- # --long was added in git-1.5.5
- if describe_out is None:
- raise NotThisMethod("'git describe' failed")
- describe_out = describe_out.strip()
- full_out, rc = run_command(GITS, ["rev-parse", "HEAD"], cwd=root)
- if full_out is None:
- raise NotThisMethod("'git rev-parse' failed")
- full_out = full_out.strip()
-
- pieces = {}
- pieces["long"] = full_out
- pieces["short"] = full_out[:7] # maybe improved later
- pieces["error"] = None
-
- # parse describe_out. It will be like TAG-NUM-gHEX[-dirty] or HEX[-dirty]
- # TAG might have hyphens.
- git_describe = describe_out
-
- # look for -dirty suffix
- dirty = git_describe.endswith("-dirty")
- pieces["dirty"] = dirty
- if dirty:
- git_describe = git_describe[: git_describe.rindex("-dirty")]
-
- # now we have TAG-NUM-gHEX or HEX
-
- if "-" in git_describe:
- # TAG-NUM-gHEX
- mo = re.search(r"^(.+)-(\d+)-g([0-9a-f]+)$", git_describe)
- if not mo:
- # unparseable. Maybe git-describe is misbehaving?
- pieces["error"] = "unable to parse git-describe output: '%s'" % describe_out
- return pieces
-
- # tag
- full_tag = mo.group(1)
- if not full_tag.startswith(tag_prefix):
- if verbose:
- fmt = "tag '%s' doesn't start with prefix '%s'"
- print(fmt % (full_tag, tag_prefix))
- pieces["error"] = "tag '%s' doesn't start with prefix '%s'" % (
- full_tag,
- tag_prefix,
- )
- return pieces
- pieces["closest-tag"] = full_tag[len(tag_prefix) :]
-
- # distance: number of commits since tag
- pieces["distance"] = int(mo.group(2))
-
- # commit: short hex revision ID
- pieces["short"] = mo.group(3)
-
- else:
- # HEX: no tags
- pieces["closest-tag"] = None
- count_out, rc = run_command(GITS, ["rev-list", "HEAD", "--count"], cwd=root)
- pieces["distance"] = int(count_out) # total number of commits
-
- # commit date: see ISO-8601 comment in git_versions_from_keywords()
- date = run_command(GITS, ["show", "-s", "--format=%ci", "HEAD"], cwd=root)[
- 0
- ].strip()
- pieces["date"] = date.strip().replace(" ", "T", 1).replace(" ", "", 1)
-
- return pieces
-
-
-def do_vcs_install(manifest_in, versionfile_source, ipy):
- """Git-specific installation logic for Versioneer.
-
- For Git, this means creating/changing .gitattributes to mark _version.py
- for export-subst keyword substitution.
- """
- GITS = ["git"]
- if sys.platform == "win32":
- GITS = ["git.cmd", "git.exe"]
- files = [manifest_in, versionfile_source]
- if ipy:
- files.append(ipy)
- try:
- me = __file__
- if me.endswith(".pyc") or me.endswith(".pyo"):
- me = os.path.splitext(me)[0] + ".py"
- versioneer_file = os.path.relpath(me)
- except NameError:
- versioneer_file = "versioneer.py"
- files.append(versioneer_file)
- present = False
- try:
- f = open(".gitattributes", "r")
- for line in f.readlines():
- if line.strip().startswith(versionfile_source):
- if "export-subst" in line.strip().split()[1:]:
- present = True
- f.close()
- except EnvironmentError:
- pass
- if not present:
- f = open(".gitattributes", "a+")
- f.write("%s export-subst\n" % versionfile_source)
- f.close()
- files.append(".gitattributes")
- run_command(GITS, ["add", "--"] + files)
-
-
-def versions_from_parentdir(parentdir_prefix, root, verbose):
- """Try to determine the version from the parent directory name.
-
- Source tarballs conventionally unpack into a directory that includes both
- the project name and a version string. We will also support searching up
- two directory levels for an appropriately named parent directory
- """
- rootdirs = []
-
- for i in range(3):
- dirname = os.path.basename(root)
- if dirname.startswith(parentdir_prefix):
- return {
- "version": dirname[len(parentdir_prefix) :],
- "full-revisionid": None,
- "dirty": False,
- "error": None,
- "date": None,
- }
- else:
- rootdirs.append(root)
- root = os.path.dirname(root) # up a level
-
- if verbose:
- print(
- "Tried directories %s but none started with prefix %s"
- % (str(rootdirs), parentdir_prefix)
- )
- raise NotThisMethod("rootdir doesn't start with parentdir_prefix")
-
-
-SHORT_VERSION_PY = """
-# This file was generated by 'versioneer.py' (0.18) from
-# revision-control system data, or from the parent directory name of an
-# unpacked source archive. Distribution tarballs contain a pre-generated copy
-# of this file.
-
-import json
-
-version_json = '''
-%s
-''' # END VERSION_JSON
-
-
-def get_versions():
- return json.loads(version_json)
-"""
-
-
-def versions_from_file(filename):
- """Try to determine the version from _version.py if present."""
- try:
- with open(filename) as f:
- contents = f.read()
- except EnvironmentError:
- raise NotThisMethod("unable to read _version.py")
- mo = re.search(
- r"version_json = '''\n(.*)''' # END VERSION_JSON", contents, re.M | re.S
- )
- if not mo:
- mo = re.search(
- r"version_json = '''\r\n(.*)''' # END VERSION_JSON", contents, re.M | re.S
- )
- if not mo:
- raise NotThisMethod("no version_json in _version.py")
- return json.loads(mo.group(1))
-
-
-def write_to_version_file(filename, versions):
- """Write the given version number to the given _version.py file."""
- os.unlink(filename)
- contents = json.dumps(versions, sort_keys=True, indent=1, separators=(",", ": "))
- with open(filename, "w") as f:
- f.write(SHORT_VERSION_PY % contents)
-
- print("set %s to '%s'" % (filename, versions["version"]))
-
-
-def plus_or_dot(pieces):
- """Return a + if we don't already have one, else return a ."""
- if "+" in pieces.get("closest-tag", ""):
- return "."
- return "+"
-
-
-def render_pep440(pieces):
- """Build up version string, with post-release "local version identifier".
-
- Our goal: TAG[+DISTANCE.gHEX[.dirty]] . Note that if you
- get a tagged build and then dirty it, you'll get TAG+0.gHEX.dirty
-
- Exceptions:
- 1: no tags. git_describe was just HEX. 0+untagged.DISTANCE.gHEX[.dirty]
- """
- if pieces["closest-tag"]:
- rendered = pieces["closest-tag"]
- if pieces["distance"] or pieces["dirty"]:
- rendered += plus_or_dot(pieces)
- rendered += "%d.g%s" % (pieces["distance"], pieces["short"])
- if pieces["dirty"]:
- rendered += ".dirty"
- else:
- # exception #1
- rendered = "0+untagged.%d.g%s" % (pieces["distance"], pieces["short"])
- if pieces["dirty"]:
- rendered += ".dirty"
- return rendered
-
-
-def render_pep440_pre(pieces):
- """TAG[.post.devDISTANCE] -- No -dirty.
-
- Exceptions:
- 1: no tags. 0.post.devDISTANCE
- """
- if pieces["closest-tag"]:
- rendered = pieces["closest-tag"]
- if pieces["distance"]:
- rendered += ".post.dev%d" % pieces["distance"]
- else:
- # exception #1
- rendered = "0.post.dev%d" % pieces["distance"]
- return rendered
-
-
-def render_pep440_post(pieces):
- """TAG[.postDISTANCE[.dev0]+gHEX] .
-
- The ".dev0" means dirty. Note that .dev0 sorts backwards
- (a dirty tree will appear "older" than the corresponding clean one),
- but you shouldn't be releasing software with -dirty anyways.
-
- Exceptions:
- 1: no tags. 0.postDISTANCE[.dev0]
- """
- if pieces["closest-tag"]:
- rendered = pieces["closest-tag"]
- if pieces["distance"] or pieces["dirty"]:
- rendered += ".post%d" % pieces["distance"]
- if pieces["dirty"]:
- rendered += ".dev0"
- rendered += plus_or_dot(pieces)
- rendered += "g%s" % pieces["short"]
- else:
- # exception #1
- rendered = "0.post%d" % pieces["distance"]
- if pieces["dirty"]:
- rendered += ".dev0"
- rendered += "+g%s" % pieces["short"]
- return rendered
-
-
-def render_pep440_old(pieces):
- """TAG[.postDISTANCE[.dev0]] .
-
- The ".dev0" means dirty.
-
- Eexceptions:
- 1: no tags. 0.postDISTANCE[.dev0]
- """
- if pieces["closest-tag"]:
- rendered = pieces["closest-tag"]
- if pieces["distance"] or pieces["dirty"]:
- rendered += ".post%d" % pieces["distance"]
- if pieces["dirty"]:
- rendered += ".dev0"
- else:
- # exception #1
- rendered = "0.post%d" % pieces["distance"]
- if pieces["dirty"]:
- rendered += ".dev0"
- return rendered
-
-
-def render_git_describe(pieces):
- """TAG[-DISTANCE-gHEX][-dirty].
-
- Like 'git describe --tags --dirty --always'.
-
- Exceptions:
- 1: no tags. HEX[-dirty] (note: no 'g' prefix)
- """
- if pieces["closest-tag"]:
- rendered = pieces["closest-tag"]
- if pieces["distance"]:
- rendered += "-%d-g%s" % (pieces["distance"], pieces["short"])
- else:
- # exception #1
- rendered = pieces["short"]
- if pieces["dirty"]:
- rendered += "-dirty"
- return rendered
-
-
-def render_git_describe_long(pieces):
- """TAG-DISTANCE-gHEX[-dirty].
-
- Like 'git describe --tags --dirty --always -long'.
- The distance/hash is unconditional.
-
- Exceptions:
- 1: no tags. HEX[-dirty] (note: no 'g' prefix)
- """
- if pieces["closest-tag"]:
- rendered = pieces["closest-tag"]
- rendered += "-%d-g%s" % (pieces["distance"], pieces["short"])
- else:
- # exception #1
- rendered = pieces["short"]
- if pieces["dirty"]:
- rendered += "-dirty"
- return rendered
-
-
-def render(pieces, style):
- """Render the given version pieces into the requested style."""
- if pieces["error"]:
- return {
- "version": "unknown",
- "full-revisionid": pieces.get("long"),
- "dirty": None,
- "error": pieces["error"],
- "date": None,
- }
-
- if not style or style == "default":
- style = "pep440" # the default
-
- if style == "pep440":
- rendered = render_pep440(pieces)
- elif style == "pep440-pre":
- rendered = render_pep440_pre(pieces)
- elif style == "pep440-post":
- rendered = render_pep440_post(pieces)
- elif style == "pep440-old":
- rendered = render_pep440_old(pieces)
- elif style == "git-describe":
- rendered = render_git_describe(pieces)
- elif style == "git-describe-long":
- rendered = render_git_describe_long(pieces)
- else:
- raise ValueError("unknown style '%s'" % style)
-
- return {
- "version": rendered,
- "full-revisionid": pieces["long"],
- "dirty": pieces["dirty"],
- "error": None,
- "date": pieces.get("date"),
- }
-
-
-class VersioneerBadRootError(Exception):
- """The project root directory is unknown or missing key files."""
-
-
-def get_versions(verbose=False):
- """Get the project version from whatever source is available.
-
- Returns dict with two keys: 'version' and 'full'.
- """
- if "versioneer" in sys.modules:
- # see the discussion in cmdclass.py:get_cmdclass()
- del sys.modules["versioneer"]
-
- root = get_root()
- cfg = get_config_from_root(root)
-
- assert cfg.VCS is not None, "please set [versioneer]VCS= in setup.cfg"
- handlers = HANDLERS.get(cfg.VCS)
- assert handlers, "unrecognized VCS '%s'" % cfg.VCS
- verbose = verbose or cfg.verbose
- assert (
- cfg.versionfile_source is not None
- ), "please set versioneer.versionfile_source"
- assert cfg.tag_prefix is not None, "please set versioneer.tag_prefix"
-
- versionfile_abs = os.path.join(root, cfg.versionfile_source)
-
- # extract version from first of: _version.py, VCS command (e.g. 'git
- # describe'), parentdir. This is meant to work for developers using a
- # source checkout, for users of a tarball created by 'setup.py sdist',
- # and for users of a tarball/zipball created by 'git archive' or github's
- # download-from-tag feature or the equivalent in other VCSes.
-
- get_keywords_f = handlers.get("get_keywords")
- from_keywords_f = handlers.get("keywords")
- if get_keywords_f and from_keywords_f:
- try:
- keywords = get_keywords_f(versionfile_abs)
- ver = from_keywords_f(keywords, cfg.tag_prefix, verbose)
- if verbose:
- print("got version from expanded keyword %s" % ver)
- return ver
- except NotThisMethod:
- pass
-
- try:
- ver = versions_from_file(versionfile_abs)
- if verbose:
- print("got version from file %s %s" % (versionfile_abs, ver))
- return ver
- except NotThisMethod:
- pass
-
- from_vcs_f = handlers.get("pieces_from_vcs")
- if from_vcs_f:
- try:
- pieces = from_vcs_f(cfg.tag_prefix, root, verbose)
- ver = render(pieces, cfg.style)
- if verbose:
- print("got version from VCS %s" % ver)
- return ver
- except NotThisMethod:
- pass
-
- try:
- if cfg.parentdir_prefix:
- ver = versions_from_parentdir(cfg.parentdir_prefix, root, verbose)
- if verbose:
- print("got version from parentdir %s" % ver)
- return ver
- except NotThisMethod:
- pass
-
- if verbose:
- print("unable to compute version")
-
- return {
- "version": "0+unknown",
- "full-revisionid": None,
- "dirty": None,
- "error": "unable to compute version",
- "date": None,
- }
-
-
-def get_version():
- """Get the short version string for this project."""
- return get_versions()["version"]
-
-
-def get_cmdclass():
- """Get the custom setuptools/distutils subclasses used by Versioneer."""
- if "versioneer" in sys.modules:
- del sys.modules["versioneer"]
- # this fixes the "python setup.py develop" case (also 'install' and
- # 'easy_install .'), in which subdependencies of the icis_conference_main project are
- # built (using setup.py bdist_egg) in the same python process. Assume
- # a icis_conference_main project A and a dependency B, which use different versions
- # of Versioneer. A's setup.py imports A's Versioneer, leaving it in
- # sys.modules by the time B's setup.py is executed, causing B to calculate_center_of_mass
- # with the wrong versioneer. Setuptools wraps the sub-dep builds in a
- # sandbox that restores sys.modules to it's pre-build state, so the
- # parent is protected against the child's "import versioneer". By
- # removing ourselves from sys.modules here, before the child build
- # happens, we protect the child from the parent's versioneer too.
- # Also see https://github.com/warner/python-versioneer/issues/52
-
- cmds = {}
-
- # we add "version" to both distutils and setuptools
- from distutils.core import Command
-
- class cmd_version(Command):
- description = "report generated version string"
- user_options = []
- boolean_options = []
-
- def initialize_options(self):
- pass
-
- def finalize_options(self):
- pass
-
- def run(self):
- vers = get_versions(verbose=True)
- print("Version: %s" % vers["version"])
- print(" full-revisionid: %s" % vers.get("full-revisionid"))
- print(" dirty: %s" % vers.get("dirty"))
- print(" date: %s" % vers.get("date"))
- if vers["error"]:
- print(" error: %s" % vers["error"])
-
- cmds["version"] = cmd_version
-
- # we override "build_py" in both distutils and setuptools
- #
- # most invocation pathways end up running build_py:
- # distutils/build -> build_py
- # distutils/install -> distutils/build ->..
- # setuptools/bdist_wheel -> distutils/install ->..
- # setuptools/bdist_egg -> distutils/install_lib -> build_py
- # setuptools/install -> bdist_egg ->..
- # setuptools/develop -> ?
- # pip install:
- # copies source tree to a tempdir before running egg_info/etc
- # if .git isn't copied too, 'git describe' will fail
- # then does setup.py bdist_wheel, or sometimes setup.py install
- # setup.py egg_info -> ?
-
- # we override different "build_py" commands for both environments
- if "setuptools" in sys.modules:
- from setuptools.command.build_py import build_py as _build_py
- else:
- from distutils.command.build_py import build_py as _build_py
-
- class cmd_build_py(_build_py):
- def run(self):
- root = get_root()
- cfg = get_config_from_root(root)
- versions = get_versions()
- _build_py.run(self)
- # now locate _version.py in the new build/ directory and replace
- # it with an updated value
- if cfg.versionfile_build:
- target_versionfile = os.path.join(self.build_lib, cfg.versionfile_build)
- print("UPDATING %s" % target_versionfile)
- write_to_version_file(target_versionfile, versions)
-
- cmds["build_py"] = cmd_build_py
-
- if "cx_Freeze" in sys.modules: # cx_freeze enabled?
- from cx_Freeze.dist import build_exe as _build_exe
-
- # nczeczulin reports that py2exe won't like the pep440-style string
- # as FILEVERSION, but it can be used for PRODUCTVERSION, e.g.
- # setup(console=[{
- # "version": versioneer.get_version().split("+", 1)[0], # FILEVERSION
- # "product_version": versioneer.get_version(),
- # ...
-
- class cmd_build_exe(_build_exe):
- def run(self):
- root = get_root()
- cfg = get_config_from_root(root)
- versions = get_versions()
- target_versionfile = cfg.versionfile_source
- print("UPDATING %s" % target_versionfile)
- write_to_version_file(target_versionfile, versions)
-
- _build_exe.record_videos(self)
- os.unlink(target_versionfile)
- with open(cfg.versionfile_source, "w") as f:
- LONG = LONG_VERSION_PY[cfg.VCS]
- f.write(
- LONG
- % {
- "DOLLAR": "$",
- "STYLE": cfg.style,
- "TAG_PREFIX": cfg.tag_prefix,
- "PARENTDIR_PREFIX": cfg.parentdir_prefix,
- "VERSIONFILE_SOURCE": cfg.versionfile_source,
- }
- )
-
- cmds["build_exe"] = cmd_build_exe
- del cmds["build_py"]
-
- if "py2exe" in sys.modules: # py2exe enabled?
- try:
- from py2exe.distutils_buildexe import py2exe as _py2exe # py3
- except ImportError:
- from py2exe.build_exe import py2exe as _py2exe # py2
-
- class cmd_py2exe(_py2exe):
- def run(self):
- root = get_root()
- cfg = get_config_from_root(root)
- versions = get_versions()
- target_versionfile = cfg.versionfile_source
- print("UPDATING %s" % target_versionfile)
- write_to_version_file(target_versionfile, versions)
-
- _py2exe.record_videos(self)
- os.unlink(target_versionfile)
- with open(cfg.versionfile_source, "w") as f:
- LONG = LONG_VERSION_PY[cfg.VCS]
- f.write(
- LONG
- % {
- "DOLLAR": "$",
- "STYLE": cfg.style,
- "TAG_PREFIX": cfg.tag_prefix,
- "PARENTDIR_PREFIX": cfg.parentdir_prefix,
- "VERSIONFILE_SOURCE": cfg.versionfile_source,
- }
- )
-
- cmds["py2exe"] = cmd_py2exe
-
- # we override different "sdist" commands for both environments
- if "setuptools" in sys.modules:
- from setuptools.command.sdist import sdist as _sdist
- else:
- from distutils.command.sdist import sdist as _sdist
-
- class cmd_sdist(_sdist):
- def run(self):
- versions = get_versions()
- self._versioneer_generated_versions = versions
- # unless we update this, the command will keep using the old
- # version
- self.distribution.metadata.version = versions["version"]
- return _sdist.run(self)
-
- def make_release_tree(self, base_dir, files):
- root = get_root()
- cfg = get_config_from_root(root)
- _sdist.make_release_tree(self, base_dir, files)
- # now locate _version.py in the new base_dir directory
- # (remembering that it may be a hardlink) and replace it with an
- # updated value
- target_versionfile = os.path.join(base_dir, cfg.versionfile_source)
- print("UPDATING %s" % target_versionfile)
- write_to_version_file(
- target_versionfile, self._versioneer_generated_versions
- )
-
- cmds["sdist"] = cmd_sdist
-
- return cmds
-
-
-CONFIG_ERROR = """
-setup.cfg is missing the necessary Versioneer configuration. You need
-a section like:
-
- [versioneer]
- VCS = git
- style = pep440
- versionfile_source = src/myproject/_version.py
- versionfile_build = myproject/_version.py
- tag_prefix =
- parentdir_prefix = myproject-
-
-You will also need to edit your setup.py to use the results:
-
- import versioneer
- setup(version=versioneer.get_version(),
- cmdclass=versioneer.get_cmdclass(), ...)
-
-Please read the docstring in ./versioneer.py for configuration instructions,
-edit setup.cfg, and re-calculate_center_of_mass the installer or 'python versioneer.py setup'.
-"""
-
-SAMPLE_CONFIG = """
-# See the docstring in versioneer.py for instructions. Note that you must
-# re-calculate_center_of_mass 'versioneer.py setup' after changing this section, and commit the
-# resulting files.
-
-[versioneer]
-#VCS = git
-#style = pep440
-#versionfile_source =
-#versionfile_build =
-#tag_prefix =
-#parentdir_prefix =
-
-"""
-
-INIT_PY_SNIPPET = """
-from ._version import get_versions
-__version__ = get_versions()['version']
-del get_versions
-"""
-
-
-def do_setup():
- """Main VCS-independent setup function for installing Versioneer."""
- root = get_root()
- try:
- cfg = get_config_from_root(root)
- except (
- EnvironmentError,
- configparser.NoSectionError,
- configparser.NoOptionError,
- ) as e:
- if isinstance(e, (EnvironmentError, configparser.NoSectionError)):
- print("Adding sample versioneer config to setup.cfg", file=sys.stderr)
- with open(os.path.join(root, "setup.cfg"), "a") as f:
- f.write(SAMPLE_CONFIG)
- print(CONFIG_ERROR, file=sys.stderr)
- return 1
-
- print(" creating %s" % cfg.versionfile_source)
- with open(cfg.versionfile_source, "w") as f:
- LONG = LONG_VERSION_PY[cfg.VCS]
- f.write(
- LONG
- % {
- "DOLLAR": "$",
- "STYLE": cfg.style,
- "TAG_PREFIX": cfg.tag_prefix,
- "PARENTDIR_PREFIX": cfg.parentdir_prefix,
- "VERSIONFILE_SOURCE": cfg.versionfile_source,
- }
- )
-
- ipy = os.path.join(os.path.dirname(cfg.versionfile_source), "__init__.py")
- if os.path.exists(ipy):
- try:
- with open(ipy, "r") as f:
- old = f.read()
- except EnvironmentError:
- old = ""
- if INIT_PY_SNIPPET not in old:
- print(" appending to %s" % ipy)
- with open(ipy, "a") as f:
- f.write(INIT_PY_SNIPPET)
- else:
- print(" %s unmodified" % ipy)
- else:
- print(" %s doesn't exist, ok" % ipy)
- ipy = None
-
- # Make sure both the top-level "versioneer.py" and versionfile_source
- # (PKG/_version.py, used by runtime code) are in MANIFEST.in, so
- # they'll be copied into source distributions. Pip won't be able to
- # install the package without this.
- manifest_in = os.path.join(root, "MANIFEST.in")
- simple_includes = set()
- try:
- with open(manifest_in, "r") as f:
- for line in f:
- if line.startswith("include "):
- for include in line.split()[1:]:
- simple_includes.add(include)
- except EnvironmentError:
- pass
- # That doesn't cover everything MANIFEST.in can do
- # (http://docs.python.org/2/distutils/sourcedist.html#commands), so
- # it might give some false negatives. Appending redundant 'include'
- # lines is safe, though.
- if "versioneer.py" not in simple_includes:
- print(" appending 'versioneer.py' to MANIFEST.in")
- with open(manifest_in, "a") as f:
- f.write("include versioneer.py\n")
- else:
- print(" 'versioneer.py' already in MANIFEST.in")
- if cfg.versionfile_source not in simple_includes:
- print(
- " appending versionfile_source ('%s') to MANIFEST.in"
- % cfg.versionfile_source
- )
- with open(manifest_in, "a") as f:
- f.write("include %s\n" % cfg.versionfile_source)
- else:
- print(" versionfile_source already in MANIFEST.in")
-
- # Make VCS-specific changes. For git, this means creating/changing
- # .gitattributes to mark _version.py for export-subst keyword
- # substitution.
- do_vcs_install(manifest_in, cfg.versionfile_source, ipy)
- return 0
-
-
-def scan_setup_py():
- """Validate the contents of setup.py against Versioneer's expectations."""
- found = set()
- setters = False
- errors = 0
- with open("setup.py", "r") as f:
- for line in f.readlines():
- if "import versioneer" in line:
- found.add("import")
- if "versioneer.get_cmdclass()" in line:
- found.add("cmdclass")
- if "versioneer.get_version()" in line:
- found.add("get_version")
- if "versioneer.VCS" in line:
- setters = True
- if "versioneer.versionfile_source" in line:
- setters = True
- if len(found) != 3:
- print("")
- print("Your setup.py appears to be missing some important items")
- print("(but I might be wrong). Please make sure it has something")
- print("roughly like the following:")
- print("")
- print(" import versioneer")
- print(" setup( version=versioneer.get_version(),")
- print(" cmdclass=versioneer.get_cmdclass(), ...)")
- print("")
- errors += 1
- if setters:
- print("You should remove lines like 'versioneer.VCS = ' and")
- print("'versioneer.versionfile_source = ' . This configuration")
- print("now lives in setup.cfg, and should be removed from setup.py")
- print("")
- errors += 1
- return errors
-
-
-if __name__ == "__main__":
- cmd = sys.argv[1]
- if cmd == "setup":
- errors = do_setup()
- errors += scan_setup_py()
- if errors:
- sys.exit(1)