Skip to content

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

TypeScript

Jon/add release notes dialog (#694)

jonmatthisb77d9deac7a8
diff --git a/.gitignore b/.gitignore
index feeab654..c7cac8a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -156,4 +156,5 @@ desktop.ini
node_modules/
freemocap/system/gui_state.json
.nuxt
-/tauri-nuxt-vue/.idea/
\ No newline at end of file
+/tauri-nuxt-vue/.idea/
+dist-electron/
\ No newline at end of file
diff --git a/README.md b/README.md
index 85a6028a..940cc6c9 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,11 @@ https://user-images.githubusercontent.com/15314521/192062522-2a8d9305-f181-4869-
--
## QUICKSTART
-#### 0. Create a a Python 3.10 through 3.12 environment (python3.11 recommended)ΒΆ
+> [!NOTE]
+> For detailed installation instructions, see our [official documentation's Installation page](https://freemocap.github.io/documentation/installation.html#detailed-pip-installation-instructions)
+
+
+#### 0. Create a a Python 3.10 through 3.12 environment (python3.12 recommended)
#### 1. Install software via [pip](https://pypi.org/project/freemocap/#description):
```
@@ -68,7 +72,7 @@ freemocap
<img width="1457" alt="image" src="https://github.com/freemocap/freemocap/assets/15314521/90ef7e7b-48f3-4f46-8d4a-5b5bcc3254b3">
-#### 4. Have fun! It might break! Work in Progress lol
+#### 4. Have fun! See the [Beginner Tutorials](https://freemocap.github.io/documentation/your-first-recording.html) on our official docs for detailed instructions.
#### 5. [Join the Discord and let us know how it went!](https://discord.gg/nxv5dNTfKT)
diff --git a/freemocap/__main__.py b/freemocap/__main__.py
index f20ed8c2..b2023c82 100644
--- a/freemocap/__main__.py
+++ b/freemocap/__main__.py
@@ -3,7 +3,6 @@ import sys
from multiprocessing import freeze_support
from pathlib import Path
-
try:
from freemocap.gui.qt.freemocap_main import qt_gui_main
except Exception:
diff --git a/freemocap/assets/logo/freemocap-logo-black-border.svg b/freemocap/assets/logo/freemocap-logo-black-border.svg
index 37fb2b1d..e6d84210 100644
--- a/freemocap/assets/logo/freemocap-logo-black-border.svg
+++ b/freemocap/assets/logo/freemocap-logo-black-border.svg
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink"
+ version="1.1"
id="svg8"
inkscape:version="1.0.2 (e86c8708, 2021-01-15)"
sodipodi:docname="fmc-logo-border-2.svg" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
diff --git a/freemocap/assets/logo/skelly-heart-eyes.png b/freemocap/assets/logo/skelly-heart-eyes.png
new file mode 100644
index 00000000..4613c25f
Binary files /dev/null and b/freemocap/assets/logo/skelly-heart-eyes.png differ
diff --git a/freemocap/assets/logo/skelly-heart-eyes.svg b/freemocap/assets/logo/skelly-heart-eyes.svg
new file mode 100644
index 00000000..56e89a38
--- /dev/null
+++ b/freemocap/assets/logo/skelly-heart-eyes.svg
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ width="180mm"
+ height="180mm"
+ viewBox="0 0 180 180"
+ version="1.1"
+ id="svg1"
+ xml:space="preserve"
+ inkscape:version="1.4 (86a8ad7, 2024-10-11)"
+ sodipodi:docname="skelly-heart-eyes.svg"
+ inkscape:export-filename="skelly-heart-eyes.png"
+ inkscape:export-xdpi="96"
+ inkscape:export-ydpi="96"
+ xmlns="http://www.w3.org/2000/svg"
+><sodipodi:namedview
+ id="namedview1"
+ pagecolor="#505050"
+ bordercolor="#eeeeee"
+ borderopacity="1"
+ inkscape:showpageshadow="0"
+ inkscape:pageopacity="0"
+ inkscape:pagecheckerboard="0"
+ inkscape:deskcolor="#505050"
+ inkscape:document-units="mm"
+ inkscape:zoom="0.50835205"
+ inkscape:cx="150.48626"
+ inkscape:cy="394.41171"
+ inkscape:window-width="1920"
+ inkscape:window-height="1009"
+ inkscape:window-x="1912"
+ inkscape:window-y="-8"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="g1" />
+ <defs
+ id="defs1"><linearGradient
+ id="swatch1"
+ inkscape:swatch="solid"><stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop1" /></linearGradient></defs>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"><g
+ id="g1"
+ transform="matrix(0.26458333,0,0,0.26458333,48.328645,40.510209)"><g
+ id="layer2"
+ transform="translate(6.5984788,6.6389071)"
+ inkscape:label="Layer 2"
+ class="st0">
+ <ellipse
+ id="path962"
+ cx="171.3"
+ cy="282.5"
+ rx="146.10001"
+ ry="160.39999"/>
+</g><g
+ id="layer1-9"
+ transform="translate(-110.52076,-154.32084)"
+ 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="m 167.8,601.5 c -3.5,-0.8 -5.5,-1.7 -9.6,-4.6 -4.1,-2.8 -6.6,-5.5 -9.4,-10.2 -5,-8.3 -7.4,-17.6 -7.9,-30.1 l -0.3,-6.8 -1.6,-3.7 c -0.9,-2 -2.9,-6.6 -4.4,-10.2 -1.6,-3.6 -3.4,-8 -4.1,-9.8 -2,-5.7 -4.7,-14.2 -4.7,-14.9 0,-1.9 5.3,-4.6 7.4,-3.7 1.4,0.6 1.9,1.6 1.5,3 -0.7,2.3 -0.2,8.4 0.9,11.2 0.6,1.5 2.6,4.6 3.1,4.6 0.5,0 0.4,-2.7 -0.1,-4.8 -0.8,-3.5 -1.4,-9.2 -1.1,-10.4 0.6,-2 4.2,-3.3 6.4,-2.4 1.1,0.5 1.1,0.8 0.3,2.7 -1,2.1 -1,10.7 0,13.1 0.7,1.7 1.6,2.5 2,1.8 0.1,-0.2 0.3,-2.6 0.4,-5.4 0.3,-8.9 1.4,-11.2 5.6,-11.2 1.9,0 3.6,1.2 4.4,3.3 0.5,1.2 0.5,1.8 0.2,3.6 -0.5,2.8 -0.3,5.7 0.8,8.3 1.6,4 2.4,2.2 2.5,-5.6 0.1,-4.3 0.6,-6.3 1.8,-7.3 1,-0.8 3.5,-1 4.8,-0.3 2.1,1 2.2,1.4 2.1,5.9 -0.1,2.3 0.1,4.9 0.3,6 0.5,2.1 1.8,5 2.3,5 0.5,0 0.7,-2.5 0.8,-8.4 l 0.1,-5.3 1.3,-1.1 c 2.2,-1.7 4.1,-2.6 6.7,-2.8 l 2.4,-0.2 0.8,1.4 c 0.6,1.1 0.9,2.3 1,5.1 0.2,4.2 1,7.1 2.2,8.1 1.4,1.2 1.6,0.2 1.3,-7.4 l -0.2,-7 1.1,-1 c 0.6,-0.5 1.8,-1.2 2.7,-1.4 1.4,-0.4 1.8,-0.3 3.1,0.3 1.4,0.7 1.5,0.9 1.7,2.7 0.3,2.6 1.6,6.4 2.9,8.1 1.9,2.6 2,1.8 1,-6.5 -0.7,-5.6 -0.7,-5.1 0.6,-6.6 1.9,-2 7.1,-3.7 8.8,-2.9 0.5,0.3 1.1,1.5 1.8,3.6 2.5,7.8 3.1,9.5 3.6,9.6 0.7,0.2 1.3,-1.2 1.5,-3.7 0.2,-1.9 0,-2.8 -0.8,-5.2 -1.2,-3.5 -1.2,-4.1 -0.1,-6 0.8,-1.3 1.2,-1.6 2.5,-1.8 0.9,-0.1 3.4,-1 5.7,-2.1 2.3,-1 4.9,-2 5.9,-2.1 1.7,-0.2 1.8,-0.2 2.6,1 0.4,0.7 1.4,2.9 2.1,4.9 2.4,6.7 3,7.1 3.5,2.8 0.4,-3.2 -0.3,-6.4 -2.1,-9.1 -1.4,-2.1 -1.4,-2.4 -0.1,-3.6 2,-1.8 4.5,-2.6 8.5,-2.6 3.5,0 4,-0.1 3.1,-0.9 -0.3,-0.3 -0.3,-0.7 0.2,-1.3 0.8,-1.1 3.2,-3.1 4.3,-3.3 0.4,-0.1 1.1,-0.3 1.6,-0.4 0.7,-0.2 1.1,0.2 2.7,2.5 1.1,1.5 2.3,3.9 2.9,5.6 0.5,1.6 1.2,3 1.4,3.1 1,0.3 1.2,-4.4 0.3,-7.1 -0.5,-1.6 -1.1,-2.6 -3.9,-6.4 -0.6,-0.8 -0.6,-0.9 0.1,-1.4 1.5,-1.1 3.5,-1.9 5.9,-2.3 2.4,-0.4 2.6,-0.5 5,-2.9 2.5,-2.5 3.3,-2.9 6.6,-3.7 1.6,-0.4 1.9,-0.3 3.3,0.5 0.8,0.5 2.5,1.7 3.7,2.7 1.2,1 2.3,1.9 2.5,1.9 0.7,0 9.7,-5.9 10.1,-6.7 0.3,-0.5 2,-2.4 4,-4.3 3.8,-3.7 5.2,-5.7 6.2,-8.3 1.5,-4.2 1.7,-20.1 0.5,-27.9 -1.1,-6.4 -2.2,-18.6 -2.1,-21.1 0.1,-1.8 0.5,-3.1 1.3,-4.6 1.9,-3.5 4.1,-4.5 10.3,-4.5 h 3.8 l 4.4,2.2 c 5.9,3 7.9,3.3 12.2,2 4,-1.2 6.7,-3.1 9.8,-6.8 2.9,-3.5 6.8,-10.1 8.3,-13.8 2.2,-5.7 5,-8.7 7.9,-8.7 3.3,0 4.7,1.7 6.1,7.3 0.8,3.1 0.8,4 0.9,26.5 0.1,22.1 0.1,23.4 0.9,26.9 0.4,2 1.2,5.6 1.7,7.9 0.5,2.3 1,4.6 1.2,5.1 0.2,0.5 0.7,2.9 1.1,5.4 1.4,7.6 0.6,15.2 -2.3,22.2 -1.7,4.1 -2.9,6.1 -6.5,11.5 -3.9,5.8 -11.3,13.2 -18,18.1 -2.3,1.7 -7.8,6.2 -12.3,10 -9.4,8 -12.2,10.3 -18.5,15 -2.5,1.9 -8,5.9 -12.1,8.9 -4.1,3 -11.1,8 -15.6,11 -4.4,3 -8.7,5.9 -9.4,6.5 -2.8,2.1 -12.3,8.5 -17.3,11.7 -18.4,11.8 -36.7,21.1 -54.9,27.8 -7.8,2.9 -11.2,3.8 -19.6,5.1 -8.5,1.5 -14.9,1.9 -18.3,1.1 z M 363.2,433.2 c 0,-0.1 -0.1,-0.2 -0.2,-0.2 -0.1,0 -0.2,0.1 -0.2,0.2 0,0.1 0.1,0.2 0.2,0.2 0.1,0 0.2,-0.1 0.2,-0.2 z m -203.9,44.1 c -1.5,-0.4 -3,-0.8 -3.1,-1 -0.5,-0.6 -1.2,-6.1 -1.5,-12.7 -0.3,-6.2 -0.8,-9 -1.5,-8.3 -0.4,0.4 -1.8,6.1 -2.3,9.9 -0.3,1.7 -0.3,4.1 -0.2,5.9 l 0.3,3 -1.7,0.5 c -1,0.3 -3.2,0.5 -5.7,0.5 -3.8,0 -4.2,-0.1 -6.4,-1.1 -2.1,-1.1 -2.3,-1.2 -2.8,-3 -0.9,-3.3 -1.2,-7.3 -1.3,-13.7 0,-3.5 -0.2,-6.4 -0.4,-6.4 -0.5,0 -1.4,2.3 -2.1,5.3 -0.5,2.4 -0.8,9.1 -0.5,12.8 0.1,1.2 0,1.3 -1.5,1.6 -2.4,0.5 -5.5,-0.3 -7.4,-1.8 -1.4,-1.2 -1.6,-1.5 -2,-4 -0.8,-4.8 -0.8,-5.7 -0.9,-10.6 0,-2.7 -0.2,-4.8 -0.3,-4.8 -0.6,0 -1.9,3.6 -2.4,6.3 -0.3,1.6 -0.4,4.4 -0.2,6.9 l 0.2,4.1 -1,0.2 c -2,0.5 -4.4,-0.2 -6.2,-1.8 -2.9,-2.5 -3.2,-3.8 -3.5,-11.8 -0.6,-16.6 0.8,-31.4 3.8,-41.6 0.6,-2.1 1.4,-5.1 1.8,-6.6 0.9,-3.8 1.2,-11.8 0.6,-15 -0.4,-2.4 -2.5,-7.7 -3.1,-8.1 -0.2,-0.1 -0.3,2.4 -0.3,5.4 0,6.3 -0.5,8.5 -3,12.5 -1.9,3 -2.5,2.9 -10,-0.7 -3.3,-1.6 -8,-4.2 -10.4,-5.6 -2.4,-1.5 -5.7,-3.5 -7.2,-4.4 -3.2,-1.9 -8.4,-7 -10.9,-10.6 -1.8,-2.5 -4.3,-8.5 -5.4,-12.6 -0.3,-1.2 -0.9,-4.5 -1.4,-7.3 -0.8,-4.9 -0.8,-5.9 -0.5,-19.2 0.4,-17 0.3,-21.8 -0.4,-29.2 -0.7,-6.8 -2.8,-19.9 -4.4,-27.8 -2.7,-13.5 -3.2,-17.2 -2.7,-23.1 0.2,-2.4 0.4,-9.8 0.5,-16.4 0.1,-13.4 0.8,-20 3.1,-33.2 3.8,-21.2 12.4,-44.9 22.7,-62.2 13.7,-23.1 34.5,-44 57.8,-58.1 6,-3.6 16.9,-9.1 22.4,-11.3 6.3,-2.5 22.2,-7.9 28.1,-9.6 17.9,-5.1 36.2,-8.1 57,-9.5 7.2,-0.5 26.7,-0.5 33.9,0 35.5,2.4 67.6,10 97.5,23.3 30.2,13.4 56.9,33.9 73.6,56.5 9.1,12.3 14.1,22.8 20.4,42.9 3,9.5 5.3,21.7 6.3,33.6 0.5,5.7 0.5,22.3 0,28.5 -2.2,27.5 -9.5,53.2 -21.7,76.4 -14.1,26.8 -31.9,47 -53.6,60.8 -8.9,5.6 -21.4,11 -25.6,11 -2.2,0 -2.6,-0.5 -2.1,-2.9 0.2,-1.1 0.4,-4.1 0.4,-6.7 0,-5.6 -0.6,-7.7 -3.1,-10.5 -2.9,-3.1 -6.6,-4.2 -9.6,-2.8 -1,0.5 -4.3,3.2 -8.2,6.9 -6.3,5.9 -10.9,9.4 -14.3,10.7 -7,2.8 -22.9,5.1 -41.9,6 -7.5,0.4 -15.7,1 -16.7,1.3 -0.3,0.1 -2.4,0.3 -4.6,0.6 -4.5,0.5 -12.1,2.5 -15.4,4.1 -2.6,1.2 -5.4,3.2 -5.4,3.7 0,0.7 1.8,0.4 4.3,-0.7 2.6,-1.1 7.5,-2.5 7.8,-2.2 0.1,0.1 -0.5,1.6 -1.3,3.3 -2.1,4.3 -2.5,6.4 -2.2,11.5 0.2,3.3 0.5,5 1.4,8.1 2.6,8.3 1,15.2 -4.1,17.5 -1.4,0.6 -1.5,0.8 -2.6,3.9 -1.2,3.2 -4.9,6.3 -8.1,6.7 -1,0.1 -1.1,0 -1.8,-1.9 -0.4,-1.1 -1.3,-3.2 -2.1,-4.6 -1.4,-2.6 -4.2,-5.7 -4.7,-5.2 -0.2,0.1 0.7,3 1.9,6.4 1.2,3.4 2.2,6.6 2.2,7.1 0,1.3 -1.9,3.7 -4,5 -1,0.6 -3,1.4 -4.5,1.8 -2.4,0.6 -3.1,0.9 -5.2,2.8 -2.8,2.5 -4.4,3.2 -6.7,3.2 h -1.7 l -0.9,-3.2 c -0.9,-3.3 -4.1,-10.1 -4.7,-10.1 -0.6,0 -0.4,1 1.2,7 1.9,7.2 1.9,7.7 0.1,9.7 -2.9,3.1 -9.6,4.8 -14,3.6 l -1.4,-0.4 -0.1,-2.9 c -0.1,-3.3 -1.5,-9.1 -3,-12.2 -1.1,-2.4 -2.5,-4.4 -3,-4.4 -0.5,0 0,4.2 1.1,9.6 0.5,2.5 1.1,5.7 1.2,7 l 0.3,2.4 -2,1.7 c -4.6,4 -9.7,5 -16,3.4 l -2,-0.5 -0.2,-2.9 c -0.5,-5.7 -3.5,-16 -4.7,-16 -1,0 -1,4.4 -0.1,10.2 0.5,3 0.9,6.2 0.9,7 0,1.4 -0.1,1.5 -1.9,2.4 -2.8,1.5 -8.8,1.7 -13,0.7 z m 3.1,-84.6 c 0.5,-0.5 1.5,-1.9 2.2,-3.2 1.2,-2.4 1.3,-2.5 1.3,-7.6 0,-4.7 -0.1,-5.6 -1.2,-9.6 -2.7,-9.9 -10.3,-23.8 -17.7,-32.3 -2.9,-3.3 -4,-4.2 -6.5,-5.5 -2.2,-1.1 -3.4,-1 -5.1,0.3 -1.7,1.3 -1.7,1.4 -2.3,6.6 -0.5,4.9 -1.2,8.6 -2.9,16.1 -2.1,9.6 -3.4,19.4 -3.1,24.6 0.3,4.7 0.7,6.3 1.9,7.6 1.5,1.6 4.2,0.6 5.6,-2.1 2,-3.8 2.6,-9.2 3,-25.3 0.2,-10.6 0.3,-12 0.8,-11.6 0.9,0.7 5.7,10.3 6.6,13.3 2.4,7.5 6.4,18.6 7.8,21.4 1.2,2.4 2.2,3.7 4.2,5.6 2.8,2.8 3.8,3.1 5.4,1.7 z M 244,348.4 c 6.5,-0.8 13.2,-2.6 18.1,-5 2.5,-1.2 9.7,-7 12.1,-9.6 4.5,-5 6.4,-8.4 9,-16.2 2.3,-6.9 2.9,-10.6 2.9,-18.6 0,-10.1 -1.3,-16 -5.5,-24 -5.6,-10.7 -12.6,-18.8 -21.1,-24.3 -5.8,-3.8 -15.2,-8.1 -21.6,-9.9 -4.6,-1.3 -13,-2.8 -17.2,-3 -9.5,-0.6 -19.6,2.3 -26.1,7.5 -3.3,2.6 -7.3,8.9 -9.3,14.7 -1.3,3.7 -1.5,4.5 -1.6,8.7 -0.2,7.6 0.6,20 1.9,28.4 0.6,4.2 1.4,9.6 1.8,12 0.7,5.4 1.3,7.8 3.1,13.2 1.7,5.2 3,7.5 5.8,11 4.6,5.7 10.4,9.4 19.9,12.6 8,2.7 11.6,3.3 19.1,3.1 2.9,-0.1 6.9,-0.4 8.7,-0.6 z M 103.6,335.9 c 9.2,-3.4 14.1,-7.6 18.2,-15.3 4.9,-9.4 7.9,-31 6.1,-43.5 -1.5,-10.3 -5.3,-19.9 -10.5,-26.5 -2.4,-3 -9.3,-9 -12,-10.3 -2.4,-1.2 -7.1,-2.4 -10.5,-2.7 -2.5,-0.3 -8,0.7 -11.6,2 -1.2,0.4 -3.3,1.6 -4.6,2.5 -3.5,2.6 -5.7,5.4 -7.7,9.9 l -1.7,3.9 0.1,29.9 c 0.1,21.8 0.2,30.4 0.6,31.9 0.7,3 4.9,10.9 7,13.1 1.2,1.2 3,2.5 5.6,3.9 4.3,2.3 7.1,2.9 12.7,3 3.3,0.1 3.7,0 8.3,-1.8 z M 64.4,320.2 c -0.1,-0.1 -0.3,0 -0.3,0.2 0,0.3 0.1,0.4 0.3,0.2 0.2,-0.1 0.2,-0.3 0,-0.4 z m -0.6,-14.4 c 0,-0.1 -0.1,-0.2 -0.2,-0.2 -0.1,0 -0.2,0.1 -0.2,0.2 0,0.1 0.1,0.2 0.2,0.2 0.1,0 0.2,-0.1 0.2,-0.2 z"/>
+ <g
+ id="path959">
+ <path
+ id="path966"
+ sodipodi:nodetypes="csssssscssssssssscscccccsssssssscccssccccsscssssssssccssccscssscccssssc"
+ d="M 241.9,40.7 C 220,42.1 200.2,45.4 181,50.8 173.4,53 158.8,58 151.1,61 143.4,64 133.3,69.2 125.9,73.7 99.8,89.4 77,112.2 61.6,138.2 49.8,158 40.8,183 36.6,206.7 c -2.4,13.7 -3.3,22.4 -3.4,36.3 -0.1,6.3 -0.4,14.6 -0.4,15 -0.6,7.4 0.2,14.6 3,28.4 1.4,7.1 3.5,20.6 4.1,26 0.7,6.6 0.7,9.9 0.3,26.8 -0.3,13.3 -0.1,17.3 0.7,22.5 0.5,3.3 0.8,5.6 1.8,9.4 1.8,6.7 3.4,11.6 8.1,18.3 4.8,6.9 8.8,11.2 16.7,16 1.4,0.8 4.7,2.8 7.1,4.3 3.5,2.1 8,4.6 12,6.5 0.8,0.4 1.5,0.8 2.2,1.2 -2,11.1 -3,23.1 -2.6,36.7 0.1,4.3 0,7.5 1.5,12.7 1.6,5.2 6.1,10.6 8.3,12.6 4.5,4 10.3,6.6 17,6.6 3.9,2.5 8.1,3.2 12.5,3.2 l 0.4,0.4 c -2.1,0.5 -4,1.1 -5.7,2 -2.1,1.1 -4.2,2.3 -6.6,4.6 -2.4,2.3 -6.7,5.9 -6.7,15.1 0,5.7 0.5,4.4 0.7,5.1 0.2,0.7 0.3,1.3 0.5,1.9 0.4,1.3 0.8,2.7 1.3,4.2 1,3.1 2.2,6.8 3.3,10 1.2,3.3 2.9,7.2 4.6,11.1 1.5,3.5 3.6,8.1 4.3,9.8 l 0.2,0.6 0.1,3.4 c 0.6,14.5 3.9,27.6 10.6,38.9 3.7,6.2 9.1,12.1 14.9,16.1 4.9,3.3 11.1,6.3 16.2,7.4 l 11.9,1.2 10.5,-1.5 c 1,-0.2 1.8,-0.2 2.8,-0.4 8.8,-1.4 14.8,-3 23.1,-6.1 19.6,-7.3 39.1,-17.2 58.5,-29.6 5.5,-3.5 14.2,-9.3 18.3,-12.4 -1.1,0.8 4.5,-3.1 8.9,-6.1 4.8,-3.2 11.7,-8.2 16.2,-11.5 4.1,-3 9.6,-7.1 12.1,-8.9 6.5,-4.8 10.2,-7.7 19.6,-15.8 4.1,-3.6 10.1,-8.3 11.2,-9.2 8.6,-6.4 16.4,-14.1 22.3,-22.6 3.9,-5.7 6.3,-10 8.3,-14.9 4.3,-10.3 5.4,-21.7 3.4,-32.7 -0.3,-1.4 -0.5,-2.8 -0.8,-4 -0.3,-1.2 0.6,0.1 -1.3,-4.8 1.5,3.8 0.5,1.5 0.3,0.8 -0.2,-0.7 -0.4,-1.7 -0.6,-2.7 -0.5,-2.5 -1.2,-6 -1.7,-8.3 v 0 c -0.3,-1.3 -0.2,-0.1 -0.3,-3.1 -0.1,-2.7 -0.1,-8.9 -0.1,-18.3 1.9,-0.8 3.7,-1.7 5.9,-2.6 5.7,-2.5 11.7,-5.5 17.2,-9 24.8,-15.8 44.8,-38.7 60.2,-67.9 13.4,-25.5 21.4,-53.7 23.8,-83.6 v 0 c 0.7,-8.9 0.8,-22.8 0,-31.6 -1.2,-13.2 -3.6,-26.3 -7.1,-37.6 -6.6,-21 -13,-34.7 -23.2,-48.5 C 443.8,102.2 414.9,80.2 381.9,65.6 349.9,51.4 315.4,43.2 278,40.7 c -9.2,-0.6 -26.7,-0.6 -36.1,0 z"/>
+ <path
+ id="path968"
+ class="st2"
+ d="m 167.8,601.5 c -3.5,-0.8 -5.5,-1.7 -9.6,-4.6 -4.1,-2.8 -6.6,-5.5 -9.4,-10.2 -5,-8.3 -7.4,-17.6 -7.9,-30.1 l -0.3,-6.8 -1.6,-3.7 c -0.9,-2 -2.9,-6.6 -4.4,-10.2 -1.6,-3.6 -3.4,-8 -4.1,-9.8 -2,-5.7 -4.7,-14.2 -4.7,-14.9 0,-1.9 5.3,-4.6 7.4,-3.7 1.4,0.6 1.9,1.6 1.5,3 -0.7,2.3 -0.2,8.4 0.9,11.2 0.6,1.5 2.6,4.6 3.1,4.6 0.5,0 0.4,-2.7 -0.1,-4.8 -0.8,-3.5 -1.4,-9.2 -1.1,-10.4 0.6,-2 4.2,-3.3 6.4,-2.4 1.1,0.5 1.1,0.8 0.3,2.7 -1,2.1 -1,10.7 0,13.1 0.7,1.7 1.6,2.5 2,1.8 0.1,-0.2 0.3,-2.6 0.4,-5.4 0.3,-8.9 1.4,-11.2 5.6,-11.2 1.9,0 3.6,1.2 4.4,3.3 0.5,1.2 0.5,1.8 0.2,3.6 -0.5,2.8 -0.3,5.7 0.8,8.3 1.6,4 2.4,2.2 2.5,-5.6 0.1,-4.3 0.6,-6.3 1.8,-7.3 1,-0.8 3.5,-1 4.8,-0.3 2.1,1 2.2,1.4 2.1,5.9 -0.1,2.3 0.1,4.9 0.3,6 0.5,2.1 1.8,5 2.3,5 0.5,0 0.7,-2.5 0.8,-8.4 l 0.1,-5.3 1.3,-1.1 c 2.2,-1.7 4.1,-2.6 6.7,-2.8 l 2.4,-0.2 0.8,1.4 c 0.6,1.1 0.9,2.3 1,5.1 0.2,4.2 1,7.1 2.2,8.1 1.4,1.2 1.6,0.2 1.3,-7.4 l -0.2,-7 1.1,-1 c 0.6,-0.5 1.8,-1.2 2.7,-1.4 1.4,-0.4 1.8,-0.3 3.1,0.3 1.4,0.7 1.5,0.9 1.7,2.7 0.3,2.6 1.6,6.4 2.9,8.1 1.9,2.6 2,1.8 1,-6.5 -0.7,-5.6 -0.7,-5.1 0.6,-6.6 1.9,-2 7.1,-3.7 8.8,-2.9 0.5,0.3 1.1,1.5 1.8,3.6 2.5,7.8 3.1,9.5 3.6,9.6 0.7,0.2 1.3,-1.2 1.5,-3.7 0.2,-1.9 0,-2.8 -0.8,-5.2 -1.2,-3.5 -1.2,-4.1 -0.1,-6 0.8,-1.3 1.2,-1.6 2.5,-1.8 0.9,-0.1 3.4,-1 5.7,-2.1 2.3,-1 4.9,-2 5.9,-2.1 1.7,-0.2 1.8,-0.2 2.6,1 0.4,0.7 1.4,2.9 2.1,4.9 2.4,6.7 3,7.1 3.5,2.8 0.4,-3.2 -0.3,-6.4 -2.1,-9.1 -1.4,-2.1 -1.4,-2.4 -0.1,-3.6 2,-1.8 4.5,-2.6 8.5,-2.6 3.5,0 4,-0.1 3.1,-0.9 -0.3,-0.3 -0.3,-0.7 0.2,-1.3 0.8,-1.1 3.2,-3.1 4.3,-3.3 0.4,-0.1 1.1,-0.3 1.6,-0.4 0.7,-0.2 1.1,0.2 2.7,2.5 1.1,1.5 2.3,3.9 2.9,5.6 0.5,1.6 1.2,3 1.4,3.1 1,0.3 1.2,-4.4 0.3,-7.1 -0.5,-1.6 -1.1,-2.6 -3.9,-6.4 -0.6,-0.8 -0.6,-0.9 0.1,-1.4 1.5,-1.1 3.5,-1.9 5.9,-2.3 2.4,-0.4 2.6,-0.5 5,-2.9 2.5,-2.5 3.3,-2.9 6.6,-3.7 1.6,-0.4 1.9,-0.3 3.3,0.5 0.8,0.5 2.5,1.7 3.7,2.7 1.2,1 2.3,1.9 2.5,1.9 0.7,0 9.7,-5.9 10.1,-6.7 0.3,-0.5 2,-2.4 4,-4.3 3.8,-3.7 5.2,-5.7 6.2,-8.3 1.5,-4.2 1.7,-20.1 0.5,-27.9 -1.1,-6.4 -2.2,-18.6 -2.1,-21.1 0.1,-1.8 0.5,-3.1 1.3,-4.6 1.9,-3.5 4.1,-4.5 10.3,-4.5 h 3.8 l 4.4,2.2 c 5.9,3 7.9,3.3 12.2,2 4,-1.2 6.7,-3.1 9.8,-6.8 2.9,-3.5 6.8,-10.1 8.3,-13.8 2.2,-5.7 5,-8.7 7.9,-8.7 3.3,0 4.7,1.7 6.1,7.3 0.8,3.1 0.8,4 0.9,26.5 0.1,22.1 0.1,23.4 0.9,26.9 0.4,2 1.2,5.6 1.7,7.9 0.5,2.3 1,4.6 1.2,5.1 0.2,0.5 0.7,2.9 1.1,5.4 1.4,7.6 0.6,15.2 -2.3,22.2 -1.7,4.1 -2.9,6.1 -6.5,11.5 -3.9,5.8 -11.3,13.2 -18,18.1 -2.3,1.7 -7.8,6.2 -12.3,10 -9.4,8 -12.2,10.3 -18.5,15 -2.5,1.9 -8,5.9 -12.1,8.9 -4.1,3 -11.1,8 -15.6,11 -4.4,3 -8.7,5.9 -9.4,6.5 -2.8,2.1 -12.3,8.5 -17.3,11.7 -18.4,11.8 -36.7,21.1 -54.9,27.8 -7.8,2.9 -11.2,3.8 -19.6,5.1 -8.5,1.5 -14.9,1.9 -18.3,1.1 z M 363.2,433.2 c 0,-0.1 -0.1,-0.2 -0.2,-0.2 -0.1,0 -0.2,0.1 -0.2,0.2 0,0.1 0.1,0.2 0.2,0.2 0.1,0 0.2,-0.1 0.2,-0.2 z m -203.9,44.1 c -1.5,-0.4 -3,-0.8 -3.1,-1 -0.5,-0.6 -1.2,-6.1 -1.5,-12.7 -0.3,-6.2 -0.8,-9 -1.5,-8.3 -0.4,0.4 -1.8,6.1 -2.3,9.9 -0.3,1.7 -0.3,4.1 -0.2,5.9 l 0.3,3 -1.7,0.5 c -1,0.3 -3.2,0.5 -5.7,0.5 -3.8,0 -4.2,-0.1 -6.4,-1.1 -2.1,-1.1 -2.3,-1.2 -2.8,-3 -0.9,-3.3 -1.2,-7.3 -1.3,-13.7 0,-3.5 -0.2,-6.4 -0.4,-6.4 -0.5,0 -1.4,2.3 -2.1,5.3 -0.5,2.4 -0.8,9.1 -0.5,12.8 0.1,1.2 0,1.3 -1.5,1.6 -2.4,0.5 -5.5,-0.3 -7.4,-1.8 -1.4,-1.2 -1.6,-1.5 -2,-4 -0.8,-4.8 -0.8,-5.7 -0.9,-10.6 0,-2.7 -0.2,-4.8 -0.3,-4.8 -0.6,0 -1.9,3.6 -2.4,6.3 -0.3,1.6 -0.4,4.4 -0.2,6.9 l 0.2,4.1 -1,0.2 c -2,0.5 -4.4,-0.2 -6.2,-1.8 -2.9,-2.5 -3.2,-3.8 -3.5,-11.8 -0.6,-16.6 0.8,-31.4 3.8,-41.6 0.6,-2.1 1.4,-5.1 1.8,-6.6 0.9,-3.8 1.2,-11.8 0.6,-15 -0.4,-2.4 -2.5,-7.7 -3.1,-8.1 -0.2,-0.1 -0.3,2.4 -0.3,5.4 0,6.3 -0.5,8.5 -3,12.5 -1.9,3 -2.5,2.9 -10,-0.7 -3.3,-1.6 -8,-4.2 -10.4,-5.6 -2.4,-1.5 -5.7,-3.5 -7.2,-4.4 -3.2,-1.9 -8.4,-7 -10.9,-10.6 -1.8,-2.5 -4.3,-8.5 -5.4,-12.6 -0.3,-1.2 -0.9,-4.5 -1.4,-7.3 -0.8,-4.9 -0.8,-5.9 -0.5,-19.2 0.4,-17 0.3,-21.8 -0.4,-29.2 -0.7,-6.8 -2.8,-19.9 -4.4,-27.8 -2.7,-13.5 -3.2,-17.2 -2.7,-23.1 0.2,-2.4 0.4,-9.8 0.5,-16.4 0.1,-13.4 0.8,-20 3.1,-33.2 3.8,-21.2 12.4,-44.9 22.7,-62.2 13.7,-23.1 34.5,-44 57.8,-58.1 6,-3.6 16.9,-9.1 22.4,-11.3 6.3,-2.5 22.2,-7.9 28.1,-9.6 17.9,-5.1 36.2,-8.1 57,-9.5 7.2,-0.5 26.7,-0.5 33.9,0 35.5,2.4 67.6,10 97.5,23.3 30.2,13.4 56.9,33.9 73.6,56.5 9.1,12.3 14.1,22.8 20.4,42.9 3,9.5 5.3,21.7 6.3,33.6 0.5,5.7 0.5,22.3 0,28.5 -2.2,27.5 -9.5,53.2 -21.7,76.4 -14.1,26.8 -31.9,47 -53.6,60.8 -8.9,5.6 -21.4,11 -25.6,11 -2.2,0 -2.6,-0.5 -2.1,-2.9 0.2,-1.1 0.4,-4.1 0.4,-6.7 0,-5.6 -0.6,-7.7 -3.1,-10.5 -2.9,-3.1 -6.6,-4.2 -9.6,-2.8 -1,0.5 -4.3,3.2 -8.2,6.9 -6.3,5.9 -10.9,9.4 -14.3,10.7 -7,2.8 -22.9,5.1 -41.9,6 -7.5,0.4 -15.7,1 -16.7,1.3 -0.3,0.1 -2.4,0.3 -4.6,0.6 -4.5,0.5 -12.1,2.5 -15.4,4.1 -2.6,1.2 -5.4,3.2 -5.4,3.7 0,0.7 1.8,0.4 4.3,-0.7 2.6,-1.1 7.5,-2.5 7.8,-2.2 0.1,0.1 -0.5,1.6 -1.3,3.3 -2.1,4.3 -2.5,6.4 -2.2,11.5 0.2,3.3 0.5,5 1.4,8.1 2.6,8.3 1,15.2 -4.1,17.5 -1.4,0.6 -1.5,0.8 -2.6,3.9 -1.2,3.2 -4.9,6.3 -8.1,6.7 -1,0.1 -1.1,0 -1.8,-1.9 -0.4,-1.1 -1.3,-3.2 -2.1,-4.6 -1.4,-2.6 -4.2,-5.7 -4.7,-5.2 -0.2,0.1 0.7,3 1.9,6.4 1.2,3.4 2.2,6.6 2.2,7.1 0,1.3 -1.9,3.7 -4,5 -1,0.6 -3,1.4 -4.5,1.8 -2.4,0.6 -3.1,0.9 -5.2,2.8 -2.8,2.5 -4.4,3.2 -6.7,3.2 h -1.7 l -0.9,-3.2 c -0.9,-3.3 -4.1,-10.1 -4.7,-10.1 -0.6,0 -0.4,1 1.2,7 1.9,7.2 1.9,7.7 0.1,9.7 -2.9,3.1 -9.6,4.8 -14,3.6 l -1.4,-0.4 -0.1,-2.9 c -0.1,-3.3 -1.5,-9.1 -3,-12.2 -1.1,-2.4 -2.5,-4.4 -3,-4.4 -0.5,0 0,4.2 1.1,9.6 0.5,2.5 1.1,5.7 1.2,7 l 0.3,2.4 -2,1.7 c -4.6,4 -9.7,5 -16,3.4 l -2,-0.5 -0.2,-2.9 c -0.5,-5.7 -3.5,-16 -4.7,-16 -1,0 -1,4.4 -0.1,10.2 0.5,3 0.9,6.2 0.9,7 0,1.4 -0.1,1.5 -1.9,2.4 -2.8,1.5 -8.8,1.7 -13,0.7 z m 3.1,-84.6 c 0.5,-0.5 1.5,-1.9 2.2,-3.2 1.2,-2.4 1.3,-2.5 1.3,-7.6 0,-4.7 -0.1,-5.6 -1.2,-9.6 -2.7,-9.9 -10.3,-23.8 -17.7,-32.3 -2.9,-3.3 -4,-4.2 -6.5,-5.5 -2.2,-1.1 -3.4,-1 -5.1,0.3 -1.7,1.3 -1.7,1.4 -2.3,6.6 -0.5,4.9 -1.2,8.6 -2.9,16.1 -2.1,9.6 -3.4,19.4 -3.1,24.6 0.3,4.7 0.7,6.3 1.9,7.6 1.5,1.6 4.2,0.6 5.6,-2.1 2,-3.8 2.6,-9.2 3,-25.3 0.2,-10.6 0.3,-12 0.8,-11.6 0.9,0.7 5.7,10.3 6.6,13.3 2.4,7.5 6.4,18.6 7.8,21.4 1.2,2.4 2.2,3.7 4.2,5.6 2.8,2.8 3.8,3.1 5.4,1.7 z M 244,348.4 c 6.5,-0.8 13.2,-2.6 18.1,-5 2.5,-1.2 9.7,-7 12.1,-9.6 4.5,-5 6.4,-8.4 9,-16.2 2.3,-6.9 2.9,-10.6 2.9,-18.6 0,-10.1 -1.3,-16 -5.5,-24 -5.6,-10.7 -12.6,-18.8 -21.1,-24.3 -5.8,-3.8 -15.2,-8.1 -21.6,-9.9 -4.6,-1.3 -13,-2.8 -17.2,-3 -9.5,-0.6 -19.6,2.3 -26.1,7.5 -3.3,2.6 -7.3,8.9 -9.3,14.7 -1.3,3.7 -1.5,4.5 -1.6,8.7 -0.2,7.6 0.6,20 1.9,28.4 0.6,4.2 1.4,9.6 1.8,12 0.7,5.4 1.3,7.8 3.1,13.2 1.7,5.2 3,7.5 5.8,11 4.6,5.7 10.4,9.4 19.9,12.6 8,2.7 11.6,3.3 19.1,3.1 2.9,-0.1 6.9,-0.4 8.7,-0.6 z M 103.6,335.9 c 9.2,-3.4 14.1,-7.6 18.2,-15.3 4.9,-9.4 7.9,-31 6.1,-43.5 -1.5,-10.3 -5.3,-19.9 -10.5,-26.5 -2.4,-3 -9.3,-9 -12,-10.3 -2.4,-1.2 -7.1,-2.4 -10.5,-2.7 -2.5,-0.3 -8,0.7 -11.6,2 -1.2,0.4 -3.3,1.6 -4.6,2.5 -3.5,2.6 -5.7,5.4 -7.7,9.9 l -1.7,3.9 0.1,29.9 c 0.1,21.8 0.2,30.4 0.6,31.9 0.7,3 4.9,10.9 7,13.1 1.2,1.2 3,2.5 5.6,3.9 4.3,2.3 7.1,2.9 12.7,3 3.3,0.1 3.7,0 8.3,-1.8 z M 64.4,320.2 c -0.1,-0.1 -0.3,0 -0.3,0.2 0,0.3 0.1,0.4 0.3,0.2 0.2,-0.1 0.2,-0.3 0,-0.4 z m -0.6,-14.4 c 0,-0.1 -0.1,-0.2 -0.2,-0.2 -0.1,0 -0.2,0.1 -0.2,0.2 0,0.1 0.1,0.2 0.2,0.2 0.1,0 0.2,-0.1 0.2,-0.2 z"/>
+ <path
+ id="path988"
+ class="st3"
+ d="m 167.8,601.5 c -3.5,-0.8 -5.5,-1.7 -9.6,-4.6 -4.1,-2.8 -6.6,-5.5 -9.4,-10.2 -5,-8.3 -7.4,-17.6 -7.9,-30.1 l -0.3,-6.8 -1.6,-3.7 c -0.9,-2 -2.9,-6.6 -4.4,-10.2 -1.6,-3.6 -3.4,-8 -4.1,-9.8 -2,-5.7 -4.7,-14.2 -4.7,-14.9 0,-1.9 5.3,-4.6 7.4,-3.7 1.4,0.6 1.9,1.6 1.5,3 -0.7,2.3 -0.2,8.4 0.9,11.2 0.6,1.5 2.6,4.6 3.1,4.6 0.5,0 0.4,-2.7 -0.1,-4.8 -0.8,-3.5 -1.4,-9.2 -1.1,-10.4 0.6,-2 4.2,-3.3 6.4,-2.4 1.1,0.5 1.1,0.8 0.3,2.7 -1,2.1 -1,10.7 0,13.1 0.7,1.7 1.6,2.5 2,1.8 0.1,-0.2 0.3,-2.6 0.4,-5.4 0.3,-8.9 1.4,-11.2 5.6,-11.2 1.9,0 3.6,1.2 4.4,3.3 0.5,1.2 0.5,1.8 0.2,3.6 -0.5,2.8 -0.3,5.7 0.8,8.3 1.6,4 2.4,2.2 2.5,-5.6 0.1,-4.3 0.6,-6.3 1.8,-7.3 1,-0.8 3.5,-1 4.8,-0.3 2.1,1 2.2,1.4 2.1,5.9 -0.1,2.3 0.1,4.9 0.3,6 0.5,2.1 1.8,5 2.3,5 0.5,0 0.7,-2.5 0.8,-8.4 l 0.1,-5.3 1.3,-1.1 c 2.2,-1.7 4.1,-2.6 6.7,-2.8 l 2.4,-0.2 0.8,1.4 c 0.6,1.1 0.9,2.3 1,5.1 0.2,4.2 1,7.1 2.2,8.1 1.4,1.2 1.6,0.2 1.3,-7.4 l -0.2,-7 1.1,-1 c 0.6,-0.5 1.8,-1.2 2.7,-1.4 1.4,-0.4 1.8,-0.3 3.1,0.3 1.4,0.7 1.5,0.9 1.7,2.7 0.3,2.6 1.6,6.4 2.9,8.1 1.9,2.6 2,1.8 1,-6.5 -0.7,-5.6 -0.7,-5.1 0.6,-6.6 1.9,-2 7.1,-3.7 8.8,-2.9 0.5,0.3 1.1,1.5 1.8,3.6 2.5,7.8 3.1,9.5 3.6,9.6 0.7,0.2 1.3,-1.2 1.5,-3.7 0.2,-1.9 0,-2.8 -0.8,-5.2 -1.2,-3.5 -1.2,-4.1 -0.1,-6 0.8,-1.3 1.2,-1.6 2.5,-1.8 0.9,-0.1 3.4,-1 5.7,-2.1 2.3,-1 4.9,-2 5.9,-2.1 1.7,-0.2 1.8,-0.2 2.6,1 0.4,0.7 1.4,2.9 2.1,4.9 2.4,6.7 3,7.1 3.5,2.8 0.4,-3.2 -0.3,-6.4 -2.1,-9.1 -1.4,-2.1 -1.4,-2.4 -0.1,-3.6 2,-1.8 4.5,-2.6 8.5,-2.6 3.5,0 4,-0.1 3.1,-0.9 -0.3,-0.3 -0.3,-0.7 0.2,-1.3 0.8,-1.1 3.2,-3.1 4.3,-3.3 0.4,-0.1 1.1,-0.3 1.6,-0.4 0.7,-0.2 1.1,0.2 2.7,2.5 1.1,1.5 2.3,3.9 2.9,5.6 0.5,1.6 1.2,3 1.4,3.1 1,0.3 1.2,-4.4 0.3,-7.1 -0.5,-1.6 -1.1,-2.6 -3.9,-6.4 -0.6,-0.8 -0.6,-0.9 0.1,-1.4 1.5,-1.1 3.5,-1.9 5.9,-2.3 2.4,-0.4 2.6,-0.5 5,-2.9 2.5,-2.5 3.3,-2.9 6.6,-3.7 1.6,-0.4 1.9,-0.3 3.3,0.5 0.8,0.5 2.5,1.7 3.7,2.7 1.2,1 2.3,1.9 2.5,1.9 0.7,0 9.7,-5.9 10.1,-6.7 0.3,-0.5 2,-2.4 4,-4.3 3.8,-3.7 5.2,-5.7 6.2,-8.3 1.5,-4.2 1.7,-20.1 0.5,-27.9 -1.1,-6.4 -2.2,-18.6 -2.1,-21.1 0.1,-1.8 0.5,-3.1 1.3,-4.6 1.9,-3.5 4.1,-4.5 10.3,-4.5 h 3.8 l 4.4,2.2 c 5.9,3 7.9,3.3 12.2,2 4,-1.2 6.7,-3.1 9.8,-6.8 2.9,-3.5 6.8,-10.1 8.3,-13.8 2.2,-5.7 5,-8.7 7.9,-8.7 3.3,0 4.7,1.7 6.1,7.3 0.8,3.1 0.8,4 0.9,26.5 0.1,22.1 0.1,23.4 0.9,26.9 0.4,2 1.2,5.6 1.7,7.9 0.5,2.3 1,4.6 1.2,5.1 0.2,0.5 0.7,2.9 1.1,5.4 1.4,7.6 0.6,15.2 -2.3,22.2 -1.7,4.1 -2.9,6.1 -6.5,11.5 -3.9,5.8 -11.3,13.2 -18,18.1 -2.3,1.7 -7.8,6.2 -12.3,10 -9.4,8 -12.2,10.3 -18.5,15 -2.5,1.9 -8,5.9 -12.1,8.9 -4.1,3 -11.1,8 -15.6,11 -4.4,3 -8.7,5.9 -9.4,6.5 -2.8,2.1 -12.3,8.5 -17.3,11.7 -18.4,11.8 -36.7,21.1 -54.9,27.8 -7.8,2.9 -11.2,3.8 -19.6,5.1 -8.5,1.5 -14.9,1.9 -18.3,1.1 z M 363.2,433.2 c 0,-0.1 -0.1,-0.2 -0.2,-0.2 -0.1,0 -0.2,0.1 -0.2,0.2 0,0.1 0.1,0.2 0.2,0.2 0.1,0 0.2,-0.1 0.2,-0.2 z m -203.9,44.1 c -1.5,-0.4 -3,-0.8 -3.1,-1 -0.5,-0.6 -1.2,-6.1 -1.5,-12.7 -0.3,-6.2 -0.8,-9 -1.5,-8.3 -0.4,0.4 -1.8,6.1 -2.3,9.9 -0.3,1.7 -0.3,4.1 -0.2,5.9 l 0.3,3 -1.7,0.5 c -1,0.3 -3.2,0.5 -5.7,0.5 -3.8,0 -4.2,-0.1 -6.4,-1.1 -2.1,-1.1 -2.3,-1.2 -2.8,-3 -0.9,-3.3 -1.2,-7.3 -1.3,-13.7 0,-3.5 -0.2,-6.4 -0.4,-6.4 -0.5,0 -1.4,2.3 -2.1,5.3 -0.5,2.4 -0.8,9.1 -0.5,12.8 0.1,1.2 0,1.3 -1.5,1.6 -2.4,0.5 -5.5,-0.3 -7.4,-1.8 -1.4,-1.2 -1.6,-1.5 -2,-4 -0.8,-4.8 -0.8,-5.7 -0.9,-10.6 0,-2.7 -0.2,-4.8 -0.3,-4.8 -0.6,0 -1.9,3.6 -2.4,6.3 -0.3,1.6 -0.4,4.4 -0.2,6.9 l 0.2,4.1 -1,0.2 c -2,0.5 -4.4,-0.2 -6.2,-1.8 -2.9,-2.5 -3.2,-3.8 -3.5,-11.8 -0.6,-16.6 0.8,-31.4 3.8,-41.6 0.6,-2.1 1.4,-5.1 1.8,-6.6 0.9,-3.8 1.2,-11.8 0.6,-15 -0.4,-2.4 -2.5,-7.7 -3.1,-8.1 -0.2,-0.1 -0.3,2.4 -0.3,5.4 0,6.3 -0.5,8.5 -3,12.5 -1.9,3 -2.5,2.9 -10,-0.7 -3.3,-1.6 -8,-4.2 -10.4,-5.6 -2.4,-1.5 -5.7,-3.5 -7.2,-4.4 -3.2,-1.9 -8.4,-7 -10.9,-10.6 -1.8,-2.5 -4.3,-8.5 -5.4,-12.6 -0.3,-1.2 -0.9,-4.5 -1.4,-7.3 -0.8,-4.9 -0.8,-5.9 -0.5,-19.2 0.4,-17 0.3,-21.8 -0.4,-29.2 -0.7,-6.8 -2.8,-19.9 -4.4,-27.8 -2.7,-13.5 -3.2,-17.2 -2.7,-23.1 0.2,-2.4 0.4,-9.8 0.5,-16.4 0.1,-13.4 0.8,-20 3.1,-33.2 3.8,-21.2 12.4,-44.9 22.7,-62.2 13.7,-23.1 34.5,-44 57.8,-58.1 6,-3.6 16.9,-9.1 22.4,-11.3 6.3,-2.5 22.2,-7.9 28.1,-9.6 17.9,-5.1 36.2,-8.1 57,-9.5 7.2,-0.5 26.7,-0.5 33.9,0 35.5,2.4 67.6,10 97.5,23.3 30.2,13.4 56.9,33.9 73.6,56.5 9.1,12.3 14.1,22.8 20.4,42.9 3,9.5 5.3,21.7 6.3,33.6 0.5,5.7 0.5,22.3 0,28.5 -2.2,27.5 -9.5,53.2 -21.7,76.4 -14.1,26.8 -31.9,47 -53.6,60.8 -8.9,5.6 -21.4,11 -25.6,11 -2.2,0 -2.6,-0.5 -2.1,-2.9 0.2,-1.1 0.4,-4.1 0.4,-6.7 0,-5.6 -0.6,-7.7 -3.1,-10.5 -2.9,-3.1 -6.6,-4.2 -9.6,-2.8 -1,0.5 -4.3,3.2 -8.2,6.9 -6.3,5.9 -10.9,9.4 -14.3,10.7 -7,2.8 -22.9,5.1 -41.9,6 -7.5,0.4 -15.7,1 -16.7,1.3 -0.3,0.1 -2.4,0.3 -4.6,0.6 -4.5,0.5 -12.1,2.5 -15.4,4.1 -2.6,1.2 -5.4,3.2 -5.4,3.7 0,0.7 1.8,0.4 4.3,-0.7 2.6,-1.1 7.5,-2.5 7.8,-2.2 0.1,0.1 -0.5,1.6 -1.3,3.3 -2.1,4.3 -2.5,6.4 -2.2,11.5 0.2,3.3 0.5,5 1.4,8.1 2.6,8.3 1,15.2 -4.1,17.5 -1.4,0.6 -1.5,0.8 -2.6,3.9 -1.2,3.2 -4.9,6.3 -8.1,6.7 -1,0.1 -1.1,0 -1.8,-1.9 -0.4,-1.1 -1.3,-3.2 -2.1,-4.6 -1.4,-2.6 -4.2,-5.7 -4.7,-5.2 -0.2,0.1 0.7,3 1.9,6.4 1.2,3.4 2.2,6.6 2.2,7.1 0,1.3 -1.9,3.7 -4,5 -1,0.6 -3,1.4 -4.5,1.8 -2.4,0.6 -3.1,0.9 -5.2,2.8 -2.8,2.5 -4.4,3.2 -6.7,3.2 h -1.7 l -0.9,-3.2 c -0.9,-3.3 -4.1,-10.1 -4.7,-10.1 -0.6,0 -0.4,1 1.2,7 1.9,7.2 1.9,7.7 0.1,9.7 -2.9,3.1 -9.6,4.8 -14,3.6 l -1.4,-0.4 -0.1,-2.9 c -0.1,-3.3 -1.5,-9.1 -3,-12.2 -1.1,-2.4 -2.5,-4.4 -3,-4.4 -0.5,0 0,4.2 1.1,9.6 0.5,2.5 1.1,5.7 1.2,7 l 0.3,2.4 -2,1.7 c -4.6,4 -9.7,5 -16,3.4 l -2,-0.5 -0.2,-2.9 c -0.5,-5.7 -3.5,-16 -4.7,-16 -1,0 -1,4.4 -0.1,10.2 0.5,3 0.9,6.2 0.9,7 0,1.4 -0.1,1.5 -1.9,2.4 -2.8,1.5 -8.8,1.7 -13,0.7 z m 3.1,-84.6 c 0.5,-0.5 1.5,-1.9 2.2,-3.2 1.2,-2.4 1.3,-2.5 1.3,-7.6 0,-4.7 -0.1,-5.6 -1.2,-9.6 -2.7,-9.9 -10.3,-23.8 -17.7,-32.3 -2.9,-3.3 -4,-4.2 -6.5,-5.5 -2.2,-1.1 -3.4,-1 -5.1,0.3 -1.7,1.3 -1.7,1.4 -2.3,6.6 -0.5,4.9 -1.2,8.6 -2.9,16.1 -2.1,9.6 -3.4,19.4 -3.1,24.6 0.3,4.7 0.7,6.3 1.9,7.6 1.5,1.6 4.2,0.6 5.6,-2.1 2,-3.8 2.6,-9.2 3,-25.3 0.2,-10.6 0.3,-12 0.8,-11.6 0.9,0.7 5.7,10.3 6.6,13.3 2.4,7.5 6.4,18.6 7.8,21.4 1.2,2.4 2.2,3.7 4.2,5.6 2.8,2.8 3.8,3.1 5.4,1.7 z M 244,348.4 c 6.5,-0.8 13.2,-2.6 18.1,-5 2.5,-1.2 9.7,-7 12.1,-9.6 4.5,-5 6.4,-8.4 9,-16.2 2.3,-6.9 2.9,-10.6 2.9,-18.6 0,-10.1 -1.3,-16 -5.5,-24 -5.6,-10.7 -12.6,-18.8 -21.1,-24.3 -5.8,-3.8 -15.2,-8.1 -21.6,-9.9 -4.6,-1.3 -13,-2.8 -17.2,-3 -9.5,-0.6 -19.6,2.3 -26.1,7.5 -3.3,2.6 -7.3,8.9 -9.3,14.7 -1.3,3.7 -1.5,4.5 -1.6,8.7 -0.2,7.6 0.6,20 1.9,28.4 0.6,4.2 1.4,9.6 1.8,12 0.7,5.4 1.3,7.8 3.1,13.2 1.7,5.2 3,7.5 5.8,11 4.6,5.7 10.4,9.4 19.9,12.6 8,2.7 11.6,3.3 19.1,3.1 2.9,-0.1 6.9,-0.4 8.7,-0.6 z M 103.6,335.9 c 9.2,-3.4 14.1,-7.6 18.2,-15.3 4.9,-9.4 7.9,-31 6.1,-43.5 -1.5,-10.3 -5.3,-19.9 -10.5,-26.5 -2.4,-3 -9.3,-9 -12,-10.3 -2.4,-1.2 -7.1,-2.4 -10.5,-2.7 -2.5,-0.3 -8,0.7 -11.6,2 -1.2,0.4 -3.3,1.6 -4.6,2.5 -3.5,2.6 -5.7,5.4 -7.7,9.9 l -1.7,3.9 0.1,29.9 c 0.1,21.8 0.2,30.4 0.6,31.9 0.7,3 4.9,10.9 7,13.1 1.2,1.2 3,2.5 5.6,3.9 4.3,2.3 7.1,2.9 12.7,3 3.3,0.1 3.7,0 8.3,-1.8 z M 64.4,320.2 c -0.1,-0.1 -0.3,0 -0.3,0.2 0,0.3 0.1,0.4 0.3,0.2 0.2,-0.1 0.2,-0.3 0,-0.4 z m -0.6,-14.4 c 0,-0.1 -0.1,-0.2 -0.2,-0.2 -0.1,0 -0.2,0.1 -0.2,0.2 0,0.1 0.1,0.2 0.2,0.2 0.1,0 0.2,-0.1 0.2,-0.2 z"
+ sodipodi:nodetypes="ccccccccssccscccccccsccccccccscccccccccccccccccccccccccccccscsccccccccccssccssccccccscccccscccssccccccsccccccssssscccsccccscccsccccccsccccccccccsccccccccccccccccccccccccccscsccccccccscscccccccccsscccsccsccccccscccccccscsccccscccsccccccccscccccsscccccccccccccccccccccccccccccccsccsssss"/>
+ </g>
+ <path
+ id="path869"
+ class="st4"
+ d="m 237,432.3 c -0.2,-0.5 -1.3,-6.3 -2.5,-12.9 -1.2,-6.6 -3,-17 -4.2,-23.2 -2.5,-13.7 -12.2,-67.3 -15,-82.9 -0.7,-3.8 -1.4,-7.1 -1.6,-7.3 -0.2,-0.2 -2.4,-0.8 -4.8,-1.5 -15.3,-3.9 -40.4,-10.8 -42.2,-11.6 -0.9,-0.4 -1.2,-0.9 -1.2,-1.6 0,-0.5 -0.1,-1.2 -0.3,-1.4 -0.5,-0.7 0.2,-1.3 3.2,-2.6 3.8,-1.7 22.1,-8.7 33.5,-13 5,-1.8 9.3,-3.5 9.6,-3.8 0.3,-0.3 0.7,-3.6 1,-9.7 0.3,-5.1 0.9,-15.4 1.3,-22.9 0.4,-7.5 1.3,-21.9 1.9,-32 0.6,-10.1 1.5,-25.7 2.1,-34.8 0.6,-9.1 1.1,-19.1 1.3,-22.4 0.2,-3.3 0.4,-6.3 0.7,-6.7 0.4,-0.8 2.1,-0.9 2.7,-0.2 0.2,0.3 1.3,5.4 2.4,11.5 1.1,6 3.2,17.5 4.6,25.6 1.5,8 3.6,19.8 4.8,26.2 1.2,6.4 2.2,12.4 2.4,13.4 0.2,1 1,4.3 1.9,7.4 3.5,13.1 8.3,31.7 10,39.3 0.3,1.4 0.7,2.7 0.9,2.9 0.2,0.2 2.6,0.7 5.3,1.3 2.7,0.6 9.1,1.8 14.1,2.9 50.2,10.2 46.6,9.4 47.5,10.4 0.4,0.5 0.4,0.7 -0.1,1 -0.5,0.3 -0.5,0.4 -0.1,0.6 0.9,0.3 0.6,1.3 -0.6,1.9 -2.3,1.1 -26.6,8.2 -51.5,14.8 -6.3,1.7 -11.4,3.1 -11.5,3.2 -0.2,0.2 -0.8,6.3 -1.5,14.2 -0.7,8.4 -0.9,10.4 -1.4,15.2 -0.6,5.9 -0.8,7.7 -1.2,12 -0.8,7.8 -3.8,34.1 -4.6,40.7 -0.2,1.6 -0.6,4.4 -0.8,6.2 -0.2,1.8 -0.5,4.4 -0.6,5.9 -0.3,7.3 -1.6,28.5 -1.8,31.3 l -0.3,3.2 -1.3,0.1 c -1.4,0.2 -1.8,0 -2.1,-0.7 z m 54.3,-10.2 c 0,-0.1 -1.4,-7.6 -3.1,-16.7 -1.7,-9.1 -3.6,-19.1 -4.2,-22.4 -0.6,-3.3 -1.1,-6 -1.2,-6 0,0 -3,-0.8 -6.5,-1.7 -9.7,-2.5 -11.3,-3 -11.4,-3.7 -0.1,-0.8 0.1,-0.9 9.5,-4.4 4.1,-1.5 7.5,-2.8 7.5,-2.9 0.1,-0.1 0.9,-11.9 2.1,-33.4 0.6,-10.6 0.8,-12.5 1.4,-12.4 0.4,0.1 0.7,0.8 0.9,1.7 0.2,0.9 1.3,7.1 2.6,13.8 1.9,10.1 6.3,28.8 7,29.4 0.1,0.1 5.5,1.2 12.1,2.5 6.9,1.4 12.1,2.6 12.3,2.9 0.2,0.3 0.1,0.7 -0.3,1 -0.3,0.3 -5.4,1.7 -11.3,3.3 -5.9,1.6 -10.9,3 -11.3,3.2 -0.4,0.2 -0.7,1.3 -0.9,3.3 -0.9,9 -1.3,13.2 -2,19.1 -1,8.1 -1.5,13.7 -1.9,19.3 -0.2,3.3 -0.4,4.3 -0.8,4.3 -0.3,0 -0.5,-0.1 -0.5,-0.2 z m 0.6,-164.3 c -0.1,-0.2 -0.7,-2.1 -1.2,-4.3 -0.6,-2.2 -2.3,-8.9 -3.9,-14.9 -1.6,-6 -3.2,-12.4 -3.6,-14.2 l -0.7,-3.2 -7.5,-1.7 c -9.7,-2.2 -10.5,-2.4 -10.8,-3.1 -0.2,-0.6 0.1,-0.7 8.4,-2.8 2.4,-0.6 5.5,-1.4 6.8,-1.8 l 2.5,-0.7 0.7,-7.1 c 0.4,-3.9 1,-9.7 1.4,-12.7 0.4,-3.1 0.9,-7.8 1.2,-10.5 0.5,-4.6 1,-6.3 1.7,-5.3 0.1,0.2 0.6,2.5 1.1,5 0.4,2.5 1,5.3 1.2,6.1 0.2,0.9 0.7,3.3 1.1,5.3 0.9,5 4.9,18 5.7,18.4 0.7,0.4 10.4,1.5 16.3,1.8 6.8,0.4 8,0.8 6,1.8 -1.1,0.6 -14.9,4.9 -18.4,5.8 -1.6,0.4 -3,0.8 -3.2,1 -0.2,0.1 -1,6.2 -1.8,13.4 -1.4,11.7 -1.7,16.5 -1.8,22.5 -0.2,1.4 -0.6,2 -1.2,1.2 z"/>
+</g><path
+ style="fill:#6c88d6;fill-opacity:1;stroke:none;stroke-width:2.64567;stroke-miterlimit:3.6;stroke-dasharray:none;stroke-opacity:1"
+ d="M -72.692308,241.33619 0.09190207,150.84771"
+ id="path3"/><text
+ xml:space="preserve"
+ style="font-weight:bold;font-size:249.447px;font-family:Arial;-inkscape-font-specification:'Arial Bold';text-align:start;writing-mode:lr-tb;direction:ltr;text-anchor:start;fill:#d95157;fill-opacity:1;stroke:#ff0000;stroke-width:9.80052;stroke-linejoin:round;stroke-miterlimit:3.6;stroke-dasharray:none;stroke-opacity:1"
+ x="-261.01392"
+ y="148.30167"
+ id="text4"
+ transform="matrix(0.90186092,-0.21520248,0.33028435,1.0300058,0,0)"
+ inkscape:transform-center-x="-2.8243586"
+ inkscape:transform-center-y="0.41949866"><tspan
+ sodipodi:role="line"
+ id="tspan4"
+ x="-261.01392"
+ y="148.30167"
+ style="stroke:#ff0000;stroke-width:9.80052;stroke-dasharray:none;stroke-opacity:1">❀️</tspan></text><text
+ xml:space="preserve"
+ style="font-weight:bold;font-size:254.953px;font-family:Arial;-inkscape-font-specification:'Arial Bold';text-align:start;writing-mode:lr-tb;direction:ltr;text-anchor:start;fill:#d95157;fill-opacity:1;stroke:#ff0000;stroke-width:10.0169;stroke-linejoin:round;stroke-miterlimit:3.6;stroke-dasharray:none;stroke-opacity:1"
+ x="16.221428"
+ y="104.94563"
+ id="text4-1"
+ transform="matrix(0.85917843,0.331243,-0.34002784,1.0328101,0,0)"
+ inkscape:transform-center-x="-2.0902162"
+ inkscape:transform-center-y="1.9789658"><tspan
+ sodipodi:role="line"
+ id="tspan4-9"
+ x="16.221428"
+ y="104.94563"
+ style="stroke:#ff0000;stroke-width:10.0169;stroke-dasharray:none;stroke-opacity:1">❀️</tspan></text><text
+ xml:space="preserve"
+ style="font-weight:bold;font-size:14px;font-family:Arial;-inkscape-font-specification:'Arial Bold';text-align:start;writing-mode:lr-tb;direction:ltr;text-anchor:start;fill:#d95157;fill-opacity:1;stroke:#040404;stroke-width:6.3874;stroke-linejoin:round;stroke-miterlimit:3.6"
+ x="538.29767"
+ y="283.59579"
+ id="text5"><tspan
+ sodipodi:role="line"
+ id="tspan5"
+ x="538.29767"
+ y="283.59579">a</tspan></text></g></g>
+ <style
+ type="text/css"
+ id="style1">
+ .st0{display:none;}
+ .st1{display:none;fill:#A4D6D9;}
+ .st2{fill:#A4D6D9;}
+ .st3{opacity:0.15;fill:#365D5F;enable-background:new ;}
+ .st4{fill:#D95157;}
+</style></svg>
diff --git a/freemocap/assets/logo/skelly-sweat.svg b/freemocap/assets/logo/skelly-sweat.svg
index 147ae95a..40fac6b9 100644
--- a/freemocap/assets/logo/skelly-sweat.svg
+++ b/freemocap/assets/logo/skelly-sweat.svg
@@ -2,19 +2,19 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
- width="180mm"
- height="180mm"
- viewBox="0 0 180 180"
- version="1.1"
- id="svg1"
- xml:space="preserve"
- inkscape:version="1.4 (86a8ad7, 2024-10-11)"
- sodipodi:docname="skelly-sweat.svg"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ width="180mm"
+ height="180mm"
+ viewBox="0 0 180 180"
+ version="1.1"
+ id="svg1"
+ xml:space="preserve"
+ inkscape:version="1.4 (86a8ad7, 2024-10-11)"
+ sodipodi:docname="skelly-sweat.svg"
+ xmlns="http://www.w3.org/2000/svg"
+><sodipodi:namedview
id="namedview1"
pagecolor="#505050"
bordercolor="#eeeeee"
@@ -32,33 +32,37 @@
inkscape:window-x="1920"
inkscape:window-y="0"
inkscape:window-maximized="1"
- inkscape:current-layer="g1" /><defs
- id="defs1"><linearGradient
+ inkscape:current-layer="g1" />
+ <defs
+ id="defs1"><linearGradient
id="linearGradient2"
inkscape:collect="always"><stop
style="stop-color:#bde9ec;stop-opacity:1;"
offset="0"
id="stop2" /><stop
- style="stop-color:#bbebef;stop-opacity:0;"
- offset="1"
- id="stop3" /></linearGradient><linearGradient
- id="swatch1"
- inkscape:swatch="solid"><stop
+ style="stop-color:#bbebef;stop-opacity:0;"
+ offset="1"
+ id="stop3"/></linearGradient>
+ <linearGradient
+ id="swatch1"
+ inkscape:swatch="solid"><stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
- id="stop1" /></linearGradient><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2"
- id="linearGradient3"
- x1="278.38922"
- y1="128.78748"
- x2="328.90845"
- y2="187.22009"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99932235,0,0,1.0554488,-106.39275,-133.68233)" /></defs><g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"><g
+ id="stop1" /></linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2"
+ id="linearGradient3"
+ x1="278.38922"
+ y1="128.78748"
+ x2="328.90845"
+ y2="187.22009"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.99932235,0,0,1.0554488,-106.39275,-133.68233)"/></defs>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"><g
id="g1"
transform="matrix(0.26458333,0,0,0.26458333,48.328645,40.510209)"><g
id="layer2"
@@ -66,76 +70,77 @@
inkscape:label="Layer 2"
class="st0">
<ellipse
- id="path962"
- cx="171.3"
- cy="282.5"
- rx="146.10001"
- ry="160.39999" />
+ id="path962"
+ cx="171.3"
+ cy="282.5"
+ rx="146.10001"
+ ry="160.39999"/>
</g><g
- id="layer1-9"
- transform="translate(-110.52076,-154.32084)"
- inkscape:label="Layer 1">
+ id="layer1-9"
+ transform="translate(-110.52076,-154.32084)"
+ 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)">
+ 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)">
+ 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="m 167.8,601.5 c -3.5,-0.8 -5.5,-1.7 -9.6,-4.6 -4.1,-2.8 -6.6,-5.5 -9.4,-10.2 -5,-8.3 -7.4,-17.6 -7.9,-30.1 l -0.3,-6.8 -1.6,-3.7 c -0.9,-2 -2.9,-6.6 -4.4,-10.2 -1.6,-3.6 -3.4,-8 -4.1,-9.8 -2,-5.7 -4.7,-14.2 -4.7,-14.9 0,-1.9 5.3,-4.6 7.4,-3.7 1.4,0.6 1.9,1.6 1.5,3 -0.7,2.3 -0.2,8.4 0.9,11.2 0.6,1.5 2.6,4.6 3.1,4.6 0.5,0 0.4,-2.7 -0.1,-4.8 -0.8,-3.5 -1.4,-9.2 -1.1,-10.4 0.6,-2 4.2,-3.3 6.4,-2.4 1.1,0.5 1.1,0.8 0.3,2.7 -1,2.1 -1,10.7 0,13.1 0.7,1.7 1.6,2.5 2,1.8 0.1,-0.2 0.3,-2.6 0.4,-5.4 0.3,-8.9 1.4,-11.2 5.6,-11.2 1.9,0 3.6,1.2 4.4,3.3 0.5,1.2 0.5,1.8 0.2,3.6 -0.5,2.8 -0.3,5.7 0.8,8.3 1.6,4 2.4,2.2 2.5,-5.6 0.1,-4.3 0.6,-6.3 1.8,-7.3 1,-0.8 3.5,-1 4.8,-0.3 2.1,1 2.2,1.4 2.1,5.9 -0.1,2.3 0.1,4.9 0.3,6 0.5,2.1 1.8,5 2.3,5 0.5,0 0.7,-2.5 0.8,-8.4 l 0.1,-5.3 1.3,-1.1 c 2.2,-1.7 4.1,-2.6 6.7,-2.8 l 2.4,-0.2 0.8,1.4 c 0.6,1.1 0.9,2.3 1,5.1 0.2,4.2 1,7.1 2.2,8.1 1.4,1.2 1.6,0.2 1.3,-7.4 l -0.2,-7 1.1,-1 c 0.6,-0.5 1.8,-1.2 2.7,-1.4 1.4,-0.4 1.8,-0.3 3.1,0.3 1.4,0.7 1.5,0.9 1.7,2.7 0.3,2.6 1.6,6.4 2.9,8.1 1.9,2.6 2,1.8 1,-6.5 -0.7,-5.6 -0.7,-5.1 0.6,-6.6 1.9,-2 7.1,-3.7 8.8,-2.9 0.5,0.3 1.1,1.5 1.8,3.6 2.5,7.8 3.1,9.5 3.6,9.6 0.7,0.2 1.3,-1.2 1.5,-3.7 0.2,-1.9 0,-2.8 -0.8,-5.2 -1.2,-3.5 -1.2,-4.1 -0.1,-6 0.8,-1.3 1.2,-1.6 2.5,-1.8 0.9,-0.1 3.4,-1 5.7,-2.1 2.3,-1 4.9,-2 5.9,-2.1 1.7,-0.2 1.8,-0.2 2.6,1 0.4,0.7 1.4,2.9 2.1,4.9 2.4,6.7 3,7.1 3.5,2.8 0.4,-3.2 -0.3,-6.4 -2.1,-9.1 -1.4,-2.1 -1.4,-2.4 -0.1,-3.6 2,-1.8 4.5,-2.6 8.5,-2.6 3.5,0 4,-0.1 3.1,-0.9 -0.3,-0.3 -0.3,-0.7 0.2,-1.3 0.8,-1.1 3.2,-3.1 4.3,-3.3 0.4,-0.1 1.1,-0.3 1.6,-0.4 0.7,-0.2 1.1,0.2 2.7,2.5 1.1,1.5 2.3,3.9 2.9,5.6 0.5,1.6 1.2,3 1.4,3.1 1,0.3 1.2,-4.4 0.3,-7.1 -0.5,-1.6 -1.1,-2.6 -3.9,-6.4 -0.6,-0.8 -0.6,-0.9 0.1,-1.4 1.5,-1.1 3.5,-1.9 5.9,-2.3 2.4,-0.4 2.6,-0.5 5,-2.9 2.5,-2.5 3.3,-2.9 6.6,-3.7 1.6,-0.4 1.9,-0.3 3.3,0.5 0.8,0.5 2.5,1.7 3.7,2.7 1.2,1 2.3,1.9 2.5,1.9 0.7,0 9.7,-5.9 10.1,-6.7 0.3,-0.5 2,-2.4 4,-4.3 3.8,-3.7 5.2,-5.7 6.2,-8.3 1.5,-4.2 1.7,-20.1 0.5,-27.9 -1.1,-6.4 -2.2,-18.6 -2.1,-21.1 0.1,-1.8 0.5,-3.1 1.3,-4.6 1.9,-3.5 4.1,-4.5 10.3,-4.5 h 3.8 l 4.4,2.2 c 5.9,3 7.9,3.3 12.2,2 4,-1.2 6.7,-3.1 9.8,-6.8 2.9,-3.5 6.8,-10.1 8.3,-13.8 2.2,-5.7 5,-8.7 7.9,-8.7 3.3,0 4.7,1.7 6.1,7.3 0.8,3.1 0.8,4 0.9,26.5 0.1,22.1 0.1,23.4 0.9,26.9 0.4,2 1.2,5.6 1.7,7.9 0.5,2.3 1,4.6 1.2,5.1 0.2,0.5 0.7,2.9 1.1,5.4 1.4,7.6 0.6,15.2 -2.3,22.2 -1.7,4.1 -2.9,6.1 -6.5,11.5 -3.9,5.8 -11.3,13.2 -18,18.1 -2.3,1.7 -7.8,6.2 -12.3,10 -9.4,8 -12.2,10.3 -18.5,15 -2.5,1.9 -8,5.9 -12.1,8.9 -4.1,3 -11.1,8 -15.6,11 -4.4,3 -8.7,5.9 -9.4,6.5 -2.8,2.1 -12.3,8.5 -17.3,11.7 -18.4,11.8 -36.7,21.1 -54.9,27.8 -7.8,2.9 -11.2,3.8 -19.6,5.1 -8.5,1.5 -14.9,1.9 -18.3,1.1 z M 363.2,433.2 c 0,-0.1 -0.1,-0.2 -0.2,-0.2 -0.1,0 -0.2,0.1 -0.2,0.2 0,0.1 0.1,0.2 0.2,0.2 0.1,0 0.2,-0.1 0.2,-0.2 z m -203.9,44.1 c -1.5,-0.4 -3,-0.8 -3.1,-1 -0.5,-0.6 -1.2,-6.1 -1.5,-12.7 -0.3,-6.2 -0.8,-9 -1.5,-8.3 -0.4,0.4 -1.8,6.1 -2.3,9.9 -0.3,1.7 -0.3,4.1 -0.2,5.9 l 0.3,3 -1.7,0.5 c -1,0.3 -3.2,0.5 -5.7,0.5 -3.8,0 -4.2,-0.1 -6.4,-1.1 -2.1,-1.1 -2.3,-1.2 -2.8,-3 -0.9,-3.3 -1.2,-7.3 -1.3,-13.7 0,-3.5 -0.2,-6.4 -0.4,-6.4 -0.5,0 -1.4,2.3 -2.1,5.3 -0.5,2.4 -0.8,9.1 -0.5,12.8 0.1,1.2 0,1.3 -1.5,1.6 -2.4,0.5 -5.5,-0.3 -7.4,-1.8 -1.4,-1.2 -1.6,-1.5 -2,-4 -0.8,-4.8 -0.8,-5.7 -0.9,-10.6 0,-2.7 -0.2,-4.8 -0.3,-4.8 -0.6,0 -1.9,3.6 -2.4,6.3 -0.3,1.6 -0.4,4.4 -0.2,6.9 l 0.2,4.1 -1,0.2 c -2,0.5 -4.4,-0.2 -6.2,-1.8 -2.9,-2.5 -3.2,-3.8 -3.5,-11.8 -0.6,-16.6 0.8,-31.4 3.8,-41.6 0.6,-2.1 1.4,-5.1 1.8,-6.6 0.9,-3.8 1.2,-11.8 0.6,-15 -0.4,-2.4 -2.5,-7.7 -3.1,-8.1 -0.2,-0.1 -0.3,2.4 -0.3,5.4 0,6.3 -0.5,8.5 -3,12.5 -1.9,3 -2.5,2.9 -10,-0.7 -3.3,-1.6 -8,-4.2 -10.4,-5.6 -2.4,-1.5 -5.7,-3.5 -7.2,-4.4 -3.2,-1.9 -8.4,-7 -10.9,-10.6 -1.8,-2.5 -4.3,-8.5 -5.4,-12.6 -0.3,-1.2 -0.9,-4.5 -1.4,-7.3 -0.8,-4.9 -0.8,-5.9 -0.5,-19.2 0.4,-17 0.3,-21.8 -0.4,-29.2 -0.7,-6.8 -2.8,-19.9 -4.4,-27.8 -2.7,-13.5 -3.2,-17.2 -2.7,-23.1 0.2,-2.4 0.4,-9.8 0.5,-16.4 0.1,-13.4 0.8,-20 3.1,-33.2 3.8,-21.2 12.4,-44.9 22.7,-62.2 13.7,-23.1 34.5,-44 57.8,-58.1 6,-3.6 16.9,-9.1 22.4,-11.3 6.3,-2.5 22.2,-7.9 28.1,-9.6 17.9,-5.1 36.2,-8.1 57,-9.5 7.2,-0.5 26.7,-0.5 33.9,0 35.5,2.4 67.6,10 97.5,23.3 30.2,13.4 56.9,33.9 73.6,56.5 9.1,12.3 14.1,22.8 20.4,42.9 3,9.5 5.3,21.7 6.3,33.6 0.5,5.7 0.5,22.3 0,28.5 -2.2,27.5 -9.5,53.2 -21.7,76.4 -14.1,26.8 -31.9,47 -53.6,60.8 -8.9,5.6 -21.4,11 -25.6,11 -2.2,0 -2.6,-0.5 -2.1,-2.9 0.2,-1.1 0.4,-4.1 0.4,-6.7 0,-5.6 -0.6,-7.7 -3.1,-10.5 -2.9,-3.1 -6.6,-4.2 -9.6,-2.8 -1,0.5 -4.3,3.2 -8.2,6.9 -6.3,5.9 -10.9,9.4 -14.3,10.7 -7,2.8 -22.9,5.1 -41.9,6 -7.5,0.4 -15.7,1 -16.7,1.3 -0.3,0.1 -2.4,0.3 -4.6,0.6 -4.5,0.5 -12.1,2.5 -15.4,4.1 -2.6,1.2 -5.4,3.2 -5.4,3.7 0,0.7 1.8,0.4 4.3,-0.7 2.6,-1.1 7.5,-2.5 7.8,-2.2 0.1,0.1 -0.5,1.6 -1.3,3.3 -2.1,4.3 -2.5,6.4 -2.2,11.5 0.2,3.3 0.5,5 1.4,8.1 2.6,8.3 1,15.2 -4.1,17.5 -1.4,0.6 -1.5,0.8 -2.6,3.9 -1.2,3.2 -4.9,6.3 -8.1,6.7 -1,0.1 -1.1,0 -1.8,-1.9 -0.4,-1.1 -1.3,-3.2 -2.1,-4.6 -1.4,-2.6 -4.2,-5.7 -4.7,-5.2 -0.2,0.1 0.7,3 1.9,6.4 1.2,3.4 2.2,6.6 2.2,7.1 0,1.3 -1.9,3.7 -4,5 -1,0.6 -3,1.4 -4.5,1.8 -2.4,0.6 -3.1,0.9 -5.2,2.8 -2.8,2.5 -4.4,3.2 -6.7,3.2 h -1.7 l -0.9,-3.2 c -0.9,-3.3 -4.1,-10.1 -4.7,-10.1 -0.6,0 -0.4,1 1.2,7 1.9,7.2 1.9,7.7 0.1,9.7 -2.9,3.1 -9.6,4.8 -14,3.6 l -1.4,-0.4 -0.1,-2.9 c -0.1,-3.3 -1.5,-9.1 -3,-12.2 -1.1,-2.4 -2.5,-4.4 -3,-4.4 -0.5,0 0,4.2 1.1,9.6 0.5,2.5 1.1,5.7 1.2,7 l 0.3,2.4 -2,1.7 c -4.6,4 -9.7,5 -16,3.4 l -2,-0.5 -0.2,-2.9 c -0.5,-5.7 -3.5,-16 -4.7,-16 -1,0 -1,4.4 -0.1,10.2 0.5,3 0.9,6.2 0.9,7 0,1.4 -0.1,1.5 -1.9,2.4 -2.8,1.5 -8.8,1.7 -13,0.7 z m 3.1,-84.6 c 0.5,-0.5 1.5,-1.9 2.2,-3.2 1.2,-2.4 1.3,-2.5 1.3,-7.6 0,-4.7 -0.1,-5.6 -1.2,-9.6 -2.7,-9.9 -10.3,-23.8 -17.7,-32.3 -2.9,-3.3 -4,-4.2 -6.5,-5.5 -2.2,-1.1 -3.4,-1 -5.1,0.3 -1.7,1.3 -1.7,1.4 -2.3,6.6 -0.5,4.9 -1.2,8.6 -2.9,16.1 -2.1,9.6 -3.4,19.4 -3.1,24.6 0.3,4.7 0.7,6.3 1.9,7.6 1.5,1.6 4.2,0.6 5.6,-2.1 2,-3.8 2.6,-9.2 3,-25.3 0.2,-10.6 0.3,-12 0.8,-11.6 0.9,0.7 5.7,10.3 6.6,13.3 2.4,7.5 6.4,18.6 7.8,21.4 1.2,2.4 2.2,3.7 4.2,5.6 2.8,2.8 3.8,3.1 5.4,1.7 z M 244,348.4 c 6.5,-0.8 13.2,-2.6 18.1,-5 2.5,-1.2 9.7,-7 12.1,-9.6 4.5,-5 6.4,-8.4 9,-16.2 2.3,-6.9 2.9,-10.6 2.9,-18.6 0,-10.1 -1.3,-16 -5.5,-24 -5.6,-10.7 -12.6,-18.8 -21.1,-24.3 -5.8,-3.8 -15.2,-8.1 -21.6,-9.9 -4.6,-1.3 -13,-2.8 -17.2,-3 -9.5,-0.6 -19.6,2.3 -26.1,7.5 -3.3,2.6 -7.3,8.9 -9.3,14.7 -1.3,3.7 -1.5,4.5 -1.6,8.7 -0.2,7.6 0.6,20 1.9,28.4 0.6,4.2 1.4,9.6 1.8,12 0.7,5.4 1.3,7.8 3.1,13.2 1.7,5.2 3,7.5 5.8,11 4.6,5.7 10.4,9.4 19.9,12.6 8,2.7 11.6,3.3 19.1,3.1 2.9,-0.1 6.9,-0.4 8.7,-0.6 z M 103.6,335.9 c 9.2,-3.4 14.1,-7.6 18.2,-15.3 4.9,-9.4 7.9,-31 6.1,-43.5 -1.5,-10.3 -5.3,-19.9 -10.5,-26.5 -2.4,-3 -9.3,-9 -12,-10.3 -2.4,-1.2 -7.1,-2.4 -10.5,-2.7 -2.5,-0.3 -8,0.7 -11.6,2 -1.2,0.4 -3.3,1.6 -4.6,2.5 -3.5,2.6 -5.7,5.4 -7.7,9.9 l -1.7,3.9 0.1,29.9 c 0.1,21.8 0.2,30.4 0.6,31.9 0.7,3 4.9,10.9 7,13.1 1.2,1.2 3,2.5 5.6,3.9 4.3,2.3 7.1,2.9 12.7,3 3.3,0.1 3.7,0 8.3,-1.8 z M 64.4,320.2 c -0.1,-0.1 -0.3,0 -0.3,0.2 0,0.3 0.1,0.4 0.3,0.2 0.2,-0.1 0.2,-0.3 0,-0.4 z m -0.6,-14.4 c 0,-0.1 -0.1,-0.2 -0.2,-0.2 -0.1,0 -0.2,0.1 -0.2,0.2 0,0.1 0.1,0.2 0.2,0.2 0.1,0 0.2,-0.1 0.2,-0.2 z" />
+ id="path853"
+ class="st1"
+ d="m 167.8,601.5 c -3.5,-0.8 -5.5,-1.7 -9.6,-4.6 -4.1,-2.8 -6.6,-5.5 -9.4,-10.2 -5,-8.3 -7.4,-17.6 -7.9,-30.1 l -0.3,-6.8 -1.6,-3.7 c -0.9,-2 -2.9,-6.6 -4.4,-10.2 -1.6,-3.6 -3.4,-8 -4.1,-9.8 -2,-5.7 -4.7,-14.2 -4.7,-14.9 0,-1.9 5.3,-4.6 7.4,-3.7 1.4,0.6 1.9,1.6 1.5,3 -0.7,2.3 -0.2,8.4 0.9,11.2 0.6,1.5 2.6,4.6 3.1,4.6 0.5,0 0.4,-2.7 -0.1,-4.8 -0.8,-3.5 -1.4,-9.2 -1.1,-10.4 0.6,-2 4.2,-3.3 6.4,-2.4 1.1,0.5 1.1,0.8 0.3,2.7 -1,2.1 -1,10.7 0,13.1 0.7,1.7 1.6,2.5 2,1.8 0.1,-0.2 0.3,-2.6 0.4,-5.4 0.3,-8.9 1.4,-11.2 5.6,-11.2 1.9,0 3.6,1.2 4.4,3.3 0.5,1.2 0.5,1.8 0.2,3.6 -0.5,2.8 -0.3,5.7 0.8,8.3 1.6,4 2.4,2.2 2.5,-5.6 0.1,-4.3 0.6,-6.3 1.8,-7.3 1,-0.8 3.5,-1 4.8,-0.3 2.1,1 2.2,1.4 2.1,5.9 -0.1,2.3 0.1,4.9 0.3,6 0.5,2.1 1.8,5 2.3,5 0.5,0 0.7,-2.5 0.8,-8.4 l 0.1,-5.3 1.3,-1.1 c 2.2,-1.7 4.1,-2.6 6.7,-2.8 l 2.4,-0.2 0.8,1.4 c 0.6,1.1 0.9,2.3 1,5.1 0.2,4.2 1,7.1 2.2,8.1 1.4,1.2 1.6,0.2 1.3,-7.4 l -0.2,-7 1.1,-1 c 0.6,-0.5 1.8,-1.2 2.7,-1.4 1.4,-0.4 1.8,-0.3 3.1,0.3 1.4,0.7 1.5,0.9 1.7,2.7 0.3,2.6 1.6,6.4 2.9,8.1 1.9,2.6 2,1.8 1,-6.5 -0.7,-5.6 -0.7,-5.1 0.6,-6.6 1.9,-2 7.1,-3.7 8.8,-2.9 0.5,0.3 1.1,1.5 1.8,3.6 2.5,7.8 3.1,9.5 3.6,9.6 0.7,0.2 1.3,-1.2 1.5,-3.7 0.2,-1.9 0,-2.8 -0.8,-5.2 -1.2,-3.5 -1.2,-4.1 -0.1,-6 0.8,-1.3 1.2,-1.6 2.5,-1.8 0.9,-0.1 3.4,-1 5.7,-2.1 2.3,-1 4.9,-2 5.9,-2.1 1.7,-0.2 1.8,-0.2 2.6,1 0.4,0.7 1.4,2.9 2.1,4.9 2.4,6.7 3,7.1 3.5,2.8 0.4,-3.2 -0.3,-6.4 -2.1,-9.1 -1.4,-2.1 -1.4,-2.4 -0.1,-3.6 2,-1.8 4.5,-2.6 8.5,-2.6 3.5,0 4,-0.1 3.1,-0.9 -0.3,-0.3 -0.3,-0.7 0.2,-1.3 0.8,-1.1 3.2,-3.1 4.3,-3.3 0.4,-0.1 1.1,-0.3 1.6,-0.4 0.7,-0.2 1.1,0.2 2.7,2.5 1.1,1.5 2.3,3.9 2.9,5.6 0.5,1.6 1.2,3 1.4,3.1 1,0.3 1.2,-4.4 0.3,-7.1 -0.5,-1.6 -1.1,-2.6 -3.9,-6.4 -0.6,-0.8 -0.6,-0.9 0.1,-1.4 1.5,-1.1 3.5,-1.9 5.9,-2.3 2.4,-0.4 2.6,-0.5 5,-2.9 2.5,-2.5 3.3,-2.9 6.6,-3.7 1.6,-0.4 1.9,-0.3 3.3,0.5 0.8,0.5 2.5,1.7 3.7,2.7 1.2,1 2.3,1.9 2.5,1.9 0.7,0 9.7,-5.9 10.1,-6.7 0.3,-0.5 2,-2.4 4,-4.3 3.8,-3.7 5.2,-5.7 6.2,-8.3 1.5,-4.2 1.7,-20.1 0.5,-27.9 -1.1,-6.4 -2.2,-18.6 -2.1,-21.1 0.1,-1.8 0.5,-3.1 1.3,-4.6 1.9,-3.5 4.1,-4.5 10.3,-4.5 h 3.8 l 4.4,2.2 c 5.9,3 7.9,3.3 12.2,2 4,-1.2 6.7,-3.1 9.8,-6.8 2.9,-3.5 6.8,-10.1 8.3,-13.8 2.2,-5.7 5,-8.7 7.9,-8.7 3.3,0 4.7,1.7 6.1,7.3 0.8,3.1 0.8,4 0.9,26.5 0.1,22.1 0.1,23.4 0.9,26.9 0.4,2 1.2,5.6 1.7,7.9 0.5,2.3 1,4.6 1.2,5.1 0.2,0.5 0.7,2.9 1.1,5.4 1.4,7.6 0.6,15.2 -2.3,22.2 -1.7,4.1 -2.9,6.1 -6.5,11.5 -3.9,5.8 -11.3,13.2 -18,18.1 -2.3,1.7 -7.8,6.2 -12.3,10 -9.4,8 -12.2,10.3 -18.5,15 -2.5,1.9 -8,5.9 -12.1,8.9 -4.1,3 -11.1,8 -15.6,11 -4.4,3 -8.7,5.9 -9.4,6.5 -2.8,2.1 -12.3,8.5 -17.3,11.7 -18.4,11.8 -36.7,21.1 -54.9,27.8 -7.8,2.9 -11.2,3.8 -19.6,5.1 -8.5,1.5 -14.9,1.9 -18.3,1.1 z M 363.2,433.2 c 0,-0.1 -0.1,-0.2 -0.2,-0.2 -0.1,0 -0.2,0.1 -0.2,0.2 0,0.1 0.1,0.2 0.2,0.2 0.1,0 0.2,-0.1 0.2,-0.2 z m -203.9,44.1 c -1.5,-0.4 -3,-0.8 -3.1,-1 -0.5,-0.6 -1.2,-6.1 -1.5,-12.7 -0.3,-6.2 -0.8,-9 -1.5,-8.3 -0.4,0.4 -1.8,6.1 -2.3,9.9 -0.3,1.7 -0.3,4.1 -0.2,5.9 l 0.3,3 -1.7,0.5 c -1,0.3 -3.2,0.5 -5.7,0.5 -3.8,0 -4.2,-0.1 -6.4,-1.1 -2.1,-1.1 -2.3,-1.2 -2.8,-3 -0.9,-3.3 -1.2,-7.3 -1.3,-13.7 0,-3.5 -0.2,-6.4 -0.4,-6.4 -0.5,0 -1.4,2.3 -2.1,5.3 -0.5,2.4 -0.8,9.1 -0.5,12.8 0.1,1.2 0,1.3 -1.5,1.6 -2.4,0.5 -5.5,-0.3 -7.4,-1.8 -1.4,-1.2 -1.6,-1.5 -2,-4 -0.8,-4.8 -0.8,-5.7 -0.9,-10.6 0,-2.7 -0.2,-4.8 -0.3,-4.8 -0.6,0 -1.9,3.6 -2.4,6.3 -0.3,1.6 -0.4,4.4 -0.2,6.9 l 0.2,4.1 -1,0.2 c -2,0.5 -4.4,-0.2 -6.2,-1.8 -2.9,-2.5 -3.2,-3.8 -3.5,-11.8 -0.6,-16.6 0.8,-31.4 3.8,-41.6 0.6,-2.1 1.4,-5.1 1.8,-6.6 0.9,-3.8 1.2,-11.8 0.6,-15 -0.4,-2.4 -2.5,-7.7 -3.1,-8.1 -0.2,-0.1 -0.3,2.4 -0.3,5.4 0,6.3 -0.5,8.5 -3,12.5 -1.9,3 -2.5,2.9 -10,-0.7 -3.3,-1.6 -8,-4.2 -10.4,-5.6 -2.4,-1.5 -5.7,-3.5 -7.2,-4.4 -3.2,-1.9 -8.4,-7 -10.9,-10.6 -1.8,-2.5 -4.3,-8.5 -5.4,-12.6 -0.3,-1.2 -0.9,-4.5 -1.4,-7.3 -0.8,-4.9 -0.8,-5.9 -0.5,-19.2 0.4,-17 0.3,-21.8 -0.4,-29.2 -0.7,-6.8 -2.8,-19.9 -4.4,-27.8 -2.7,-13.5 -3.2,-17.2 -2.7,-23.1 0.2,-2.4 0.4,-9.8 0.5,-16.4 0.1,-13.4 0.8,-20 3.1,-33.2 3.8,-21.2 12.4,-44.9 22.7,-62.2 13.7,-23.1 34.5,-44 57.8,-58.1 6,-3.6 16.9,-9.1 22.4,-11.3 6.3,-2.5 22.2,-7.9 28.1,-9.6 17.9,-5.1 36.2,-8.1 57,-9.5 7.2,-0.5 26.7,-0.5 33.9,0 35.5,2.4 67.6,10 97.5,23.3 30.2,13.4 56.9,33.9 73.6,56.5 9.1,12.3 14.1,22.8 20.4,42.9 3,9.5 5.3,21.7 6.3,33.6 0.5,5.7 0.5,22.3 0,28.5 -2.2,27.5 -9.5,53.2 -21.7,76.4 -14.1,26.8 -31.9,47 -53.6,60.8 -8.9,5.6 -21.4,11 -25.6,11 -2.2,0 -2.6,-0.5 -2.1,-2.9 0.2,-1.1 0.4,-4.1 0.4,-6.7 0,-5.6 -0.6,-7.7 -3.1,-10.5 -2.9,-3.1 -6.6,-4.2 -9.6,-2.8 -1,0.5 -4.3,3.2 -8.2,6.9 -6.3,5.9 -10.9,9.4 -14.3,10.7 -7,2.8 -22.9,5.1 -41.9,6 -7.5,0.4 -15.7,1 -16.7,1.3 -0.3,0.1 -2.4,0.3 -4.6,0.6 -4.5,0.5 -12.1,2.5 -15.4,4.1 -2.6,1.2 -5.4,3.2 -5.4,3.7 0,0.7 1.8,0.4 4.3,-0.7 2.6,-1.1 7.5,-2.5 7.8,-2.2 0.1,0.1 -0.5,1.6 -1.3,3.3 -2.1,4.3 -2.5,6.4 -2.2,11.5 0.2,3.3 0.5,5 1.4,8.1 2.6,8.3 1,15.2 -4.1,17.5 -1.4,0.6 -1.5,0.8 -2.6,3.9 -1.2,3.2 -4.9,6.3 -8.1,6.7 -1,0.1 -1.1,0 -1.8,-1.9 -0.4,-1.1 -1.3,-3.2 -2.1,-4.6 -1.4,-2.6 -4.2,-5.7 -4.7,-5.2 -0.2,0.1 0.7,3 1.9,6.4 1.2,3.4 2.2,6.6 2.2,7.1 0,1.3 -1.9,3.7 -4,5 -1,0.6 -3,1.4 -4.5,1.8 -2.4,0.6 -3.1,0.9 -5.2,2.8 -2.8,2.5 -4.4,3.2 -6.7,3.2 h -1.7 l -0.9,-3.2 c -0.9,-3.3 -4.1,-10.1 -4.7,-10.1 -0.6,0 -0.4,1 1.2,7 1.9,7.2 1.9,7.7 0.1,9.7 -2.9,3.1 -9.6,4.8 -14,3.6 l -1.4,-0.4 -0.1,-2.9 c -0.1,-3.3 -1.5,-9.1 -3,-12.2 -1.1,-2.4 -2.5,-4.4 -3,-4.4 -0.5,0 0,4.2 1.1,9.6 0.5,2.5 1.1,5.7 1.2,7 l 0.3,2.4 -2,1.7 c -4.6,4 -9.7,5 -16,3.4 l -2,-0.5 -0.2,-2.9 c -0.5,-5.7 -3.5,-16 -4.7,-16 -1,0 -1,4.4 -0.1,10.2 0.5,3 0.9,6.2 0.9,7 0,1.4 -0.1,1.5 -1.9,2.4 -2.8,1.5 -8.8,1.7 -13,0.7 z m 3.1,-84.6 c 0.5,-0.5 1.5,-1.9 2.2,-3.2 1.2,-2.4 1.3,-2.5 1.3,-7.6 0,-4.7 -0.1,-5.6 -1.2,-9.6 -2.7,-9.9 -10.3,-23.8 -17.7,-32.3 -2.9,-3.3 -4,-4.2 -6.5,-5.5 -2.2,-1.1 -3.4,-1 -5.1,0.3 -1.7,1.3 -1.7,1.4 -2.3,6.6 -0.5,4.9 -1.2,8.6 -2.9,16.1 -2.1,9.6 -3.4,19.4 -3.1,24.6 0.3,4.7 0.7,6.3 1.9,7.6 1.5,1.6 4.2,0.6 5.6,-2.1 2,-3.8 2.6,-9.2 3,-25.3 0.2,-10.6 0.3,-12 0.8,-11.6 0.9,0.7 5.7,10.3 6.6,13.3 2.4,7.5 6.4,18.6 7.8,21.4 1.2,2.4 2.2,3.7 4.2,5.6 2.8,2.8 3.8,3.1 5.4,1.7 z M 244,348.4 c 6.5,-0.8 13.2,-2.6 18.1,-5 2.5,-1.2 9.7,-7 12.1,-9.6 4.5,-5 6.4,-8.4 9,-16.2 2.3,-6.9 2.9,-10.6 2.9,-18.6 0,-10.1 -1.3,-16 -5.5,-24 -5.6,-10.7 -12.6,-18.8 -21.1,-24.3 -5.8,-3.8 -15.2,-8.1 -21.6,-9.9 -4.6,-1.3 -13,-2.8 -17.2,-3 -9.5,-0.6 -19.6,2.3 -26.1,7.5 -3.3,2.6 -7.3,8.9 -9.3,14.7 -1.3,3.7 -1.5,4.5 -1.6,8.7 -0.2,7.6 0.6,20 1.9,28.4 0.6,4.2 1.4,9.6 1.8,12 0.7,5.4 1.3,7.8 3.1,13.2 1.7,5.2 3,7.5 5.8,11 4.6,5.7 10.4,9.4 19.9,12.6 8,2.7 11.6,3.3 19.1,3.1 2.9,-0.1 6.9,-0.4 8.7,-0.6 z M 103.6,335.9 c 9.2,-3.4 14.1,-7.6 18.2,-15.3 4.9,-9.4 7.9,-31 6.1,-43.5 -1.5,-10.3 -5.3,-19.9 -10.5,-26.5 -2.4,-3 -9.3,-9 -12,-10.3 -2.4,-1.2 -7.1,-2.4 -10.5,-2.7 -2.5,-0.3 -8,0.7 -11.6,2 -1.2,0.4 -3.3,1.6 -4.6,2.5 -3.5,2.6 -5.7,5.4 -7.7,9.9 l -1.7,3.9 0.1,29.9 c 0.1,21.8 0.2,30.4 0.6,31.9 0.7,3 4.9,10.9 7,13.1 1.2,1.2 3,2.5 5.6,3.9 4.3,2.3 7.1,2.9 12.7,3 3.3,0.1 3.7,0 8.3,-1.8 z M 64.4,320.2 c -0.1,-0.1 -0.3,0 -0.3,0.2 0,0.3 0.1,0.4 0.3,0.2 0.2,-0.1 0.2,-0.3 0,-0.4 z m -0.6,-14.4 c 0,-0.1 -0.1,-0.2 -0.2,-0.2 -0.1,0 -0.2,0.1 -0.2,0.2 0,0.1 0.1,0.2 0.2,0.2 0.1,0 0.2,-0.1 0.2,-0.2 z"/>
<g
- id="path959">
+ id="path959">
<path
- id="path966"
- sodipodi:nodetypes="csssssscssssssssscscccccsssssssscccssccccsscssssssssccssccscssscccssssc"
- d="M 241.9,40.7 C 220,42.1 200.2,45.4 181,50.8 173.4,53 158.8,58 151.1,61 143.4,64 133.3,69.2 125.9,73.7 99.8,89.4 77,112.2 61.6,138.2 49.8,158 40.8,183 36.6,206.7 c -2.4,13.7 -3.3,22.4 -3.4,36.3 -0.1,6.3 -0.4,14.6 -0.4,15 -0.6,7.4 0.2,14.6 3,28.4 1.4,7.1 3.5,20.6 4.1,26 0.7,6.6 0.7,9.9 0.3,26.8 -0.3,13.3 -0.1,17.3 0.7,22.5 0.5,3.3 0.8,5.6 1.8,9.4 1.8,6.7 3.4,11.6 8.1,18.3 4.8,6.9 8.8,11.2 16.7,16 1.4,0.8 4.7,2.8 7.1,4.3 3.5,2.1 8,4.6 12,6.5 0.8,0.4 1.5,0.8 2.2,1.2 -2,11.1 -3,23.1 -2.6,36.7 0.1,4.3 0,7.5 1.5,12.7 1.6,5.2 6.1,10.6 8.3,12.6 4.5,4 10.3,6.6 17,6.6 3.9,2.5 8.1,3.2 12.5,3.2 l 0.4,0.4 c -2.1,0.5 -4,1.1 -5.7,2 -2.1,1.1 -4.2,2.3 -6.6,4.6 -2.4,2.3 -6.7,5.9 -6.7,15.1 0,5.7 0.5,4.4 0.7,5.1 0.2,0.7 0.3,1.3 0.5,1.9 0.4,1.3 0.8,2.7 1.3,4.2 1,3.1 2.2,6.8 3.3,10 1.2,3.3 2.9,7.2 4.6,11.1 1.5,3.5 3.6,8.1 4.3,9.8 l 0.2,0.6 0.1,3.4 c 0.6,14.5 3.9,27.6 10.6,38.9 3.7,6.2 9.1,12.1 14.9,16.1 4.9,3.3 11.1,6.3 16.2,7.4 l 11.9,1.2 10.5,-1.5 c 1,-0.2 1.8,-0.2 2.8,-0.4 8.8,-1.4 14.8,-3 23.1,-6.1 19.6,-7.3 39.1,-17.2 58.5,-29.6 5.5,-3.5 14.2,-9.3 18.3,-12.4 -1.1,0.8 4.5,-3.1 8.9,-6.1 4.8,-3.2 11.7,-8.2 16.2,-11.5 4.1,-3 9.6,-7.1 12.1,-8.9 6.5,-4.8 10.2,-7.7 19.6,-15.8 4.1,-3.6 10.1,-8.3 11.2,-9.2 8.6,-6.4 16.4,-14.1 22.3,-22.6 3.9,-5.7 6.3,-10 8.3,-14.9 4.3,-10.3 5.4,-21.7 3.4,-32.7 -0.3,-1.4 -0.5,-2.8 -0.8,-4 -0.3,-1.2 0.6,0.1 -1.3,-4.8 1.5,3.8 0.5,1.5 0.3,0.8 -0.2,-0.7 -0.4,-1.7 -0.6,-2.7 -0.5,-2.5 -1.2,-6 -1.7,-8.3 v 0 c -0.3,-1.3 -0.2,-0.1 -0.3,-3.1 -0.1,-2.7 -0.1,-8.9 -0.1,-18.3 1.9,-0.8 3.7,-1.7 5.9,-2.6 5.7,-2.5 11.7,-5.5 17.2,-9 24.8,-15.8 44.8,-38.7 60.2,-67.9 13.4,-25.5 21.4,-53.7 23.8,-83.6 v 0 c 0.7,-8.9 0.8,-22.8 0,-31.6 -1.2,-13.2 -3.6,-26.3 -7.1,-37.6 -6.6,-21 -13,-34.7 -23.2,-48.5 C 443.8,102.2 414.9,80.2 381.9,65.6 349.9,51.4 315.4,43.2 278,40.7 c -9.2,-0.6 -26.7,-0.6 -36.1,0 z" />
+ id="path966"
+ sodipodi:nodetypes="csssssscssssssssscscccccsssssssscccssccccsscssssssssccssccscssscccssssc"
+ d="M 241.9,40.7 C 220,42.1 200.2,45.4 181,50.8 173.4,53 158.8,58 151.1,61 143.4,64 133.3,69.2 125.9,73.7 99.8,89.4 77,112.2 61.6,138.2 49.8,158 40.8,183 36.6,206.7 c -2.4,13.7 -3.3,22.4 -3.4,36.3 -0.1,6.3 -0.4,14.6 -0.4,15 -0.6,7.4 0.2,14.6 3,28.4 1.4,7.1 3.5,20.6 4.1,26 0.7,6.6 0.7,9.9 0.3,26.8 -0.3,13.3 -0.1,17.3 0.7,22.5 0.5,3.3 0.8,5.6 1.8,9.4 1.8,6.7 3.4,11.6 8.1,18.3 4.8,6.9 8.8,11.2 16.7,16 1.4,0.8 4.7,2.8 7.1,4.3 3.5,2.1 8,4.6 12,6.5 0.8,0.4 1.5,0.8 2.2,1.2 -2,11.1 -3,23.1 -2.6,36.7 0.1,4.3 0,7.5 1.5,12.7 1.6,5.2 6.1,10.6 8.3,12.6 4.5,4 10.3,6.6 17,6.6 3.9,2.5 8.1,3.2 12.5,3.2 l 0.4,0.4 c -2.1,0.5 -4,1.1 -5.7,2 -2.1,1.1 -4.2,2.3 -6.6,4.6 -2.4,2.3 -6.7,5.9 -6.7,15.1 0,5.7 0.5,4.4 0.7,5.1 0.2,0.7 0.3,1.3 0.5,1.9 0.4,1.3 0.8,2.7 1.3,4.2 1,3.1 2.2,6.8 3.3,10 1.2,3.3 2.9,7.2 4.6,11.1 1.5,3.5 3.6,8.1 4.3,9.8 l 0.2,0.6 0.1,3.4 c 0.6,14.5 3.9,27.6 10.6,38.9 3.7,6.2 9.1,12.1 14.9,16.1 4.9,3.3 11.1,6.3 16.2,7.4 l 11.9,1.2 10.5,-1.5 c 1,-0.2 1.8,-0.2 2.8,-0.4 8.8,-1.4 14.8,-3 23.1,-6.1 19.6,-7.3 39.1,-17.2 58.5,-29.6 5.5,-3.5 14.2,-9.3 18.3,-12.4 -1.1,0.8 4.5,-3.1 8.9,-6.1 4.8,-3.2 11.7,-8.2 16.2,-11.5 4.1,-3 9.6,-7.1 12.1,-8.9 6.5,-4.8 10.2,-7.7 19.6,-15.8 4.1,-3.6 10.1,-8.3 11.2,-9.2 8.6,-6.4 16.4,-14.1 22.3,-22.6 3.9,-5.7 6.3,-10 8.3,-14.9 4.3,-10.3 5.4,-21.7 3.4,-32.7 -0.3,-1.4 -0.5,-2.8 -0.8,-4 -0.3,-1.2 0.6,0.1 -1.3,-4.8 1.5,3.8 0.5,1.5 0.3,0.8 -0.2,-0.7 -0.4,-1.7 -0.6,-2.7 -0.5,-2.5 -1.2,-6 -1.7,-8.3 v 0 c -0.3,-1.3 -0.2,-0.1 -0.3,-3.1 -0.1,-2.7 -0.1,-8.9 -0.1,-18.3 1.9,-0.8 3.7,-1.7 5.9,-2.6 5.7,-2.5 11.7,-5.5 17.2,-9 24.8,-15.8 44.8,-38.7 60.2,-67.9 13.4,-25.5 21.4,-53.7 23.8,-83.6 v 0 c 0.7,-8.9 0.8,-22.8 0,-31.6 -1.2,-13.2 -3.6,-26.3 -7.1,-37.6 -6.6,-21 -13,-34.7 -23.2,-48.5 C 443.8,102.2 414.9,80.2 381.9,65.6 349.9,51.4 315.4,43.2 278,40.7 c -9.2,-0.6 -26.7,-0.6 -36.1,0 z"/>
<path
- id="path968"
- class="st2"
- d="m 167.8,601.5 c -3.5,-0.8 -5.5,-1.7 -9.6,-4.6 -4.1,-2.8 -6.6,-5.5 -9.4,-10.2 -5,-8.3 -7.4,-17.6 -7.9,-30.1 l -0.3,-6.8 -1.6,-3.7 c -0.9,-2 -2.9,-6.6 -4.4,-10.2 -1.6,-3.6 -3.4,-8 -4.1,-9.8 -2,-5.7 -4.7,-14.2 -4.7,-14.9 0,-1.9 5.3,-4.6 7.4,-3.7 1.4,0.6 1.9,1.6 1.5,3 -0.7,2.3 -0.2,8.4 0.9,11.2 0.6,1.5 2.6,4.6 3.1,4.6 0.5,0 0.4,-2.7 -0.1,-4.8 -0.8,-3.5 -1.4,-9.2 -1.1,-10.4 0.6,-2 4.2,-3.3 6.4,-2.4 1.1,0.5 1.1,0.8 0.3,2.7 -1,2.1 -1,10.7 0,13.1 0.7,1.7 1.6,2.5 2,1.8 0.1,-0.2 0.3,-2.6 0.4,-5.4 0.3,-8.9 1.4,-11.2 5.6,-11.2 1.9,0 3.6,1.2 4.4,3.3 0.5,1.2 0.5,1.8 0.2,3.6 -0.5,2.8 -0.3,5.7 0.8,8.3 1.6,4 2.4,2.2 2.5,-5.6 0.1,-4.3 0.6,-6.3 1.8,-7.3 1,-0.8 3.5,-1 4.8,-0.3 2.1,1 2.2,1.4 2.1,5.9 -0.1,2.3 0.1,4.9 0.3,6 0.5,2.1 1.8,5 2.3,5 0.5,0 0.7,-2.5 0.8,-8.4 l 0.1,-5.3 1.3,-1.1 c 2.2,-1.7 4.1,-2.6 6.7,-2.8 l 2.4,-0.2 0.8,1.4 c 0.6,1.1 0.9,2.3 1,5.1 0.2,4.2 1,7.1 2.2,8.1 1.4,1.2 1.6,0.2 1.3,-7.4 l -0.2,-7 1.1,-1 c 0.6,-0.5 1.8,-1.2 2.7,-1.4 1.4,-0.4 1.8,-0.3 3.1,0.3 1.4,0.7 1.5,0.9 1.7,2.7 0.3,2.6 1.6,6.4 2.9,8.1 1.9,2.6 2,1.8 1,-6.5 -0.7,-5.6 -0.7,-5.1 0.6,-6.6 1.9,-2 7.1,-3.7 8.8,-2.9 0.5,0.3 1.1,1.5 1.8,3.6 2.5,7.8 3.1,9.5 3.6,9.6 0.7,0.2 1.3,-1.2 1.5,-3.7 0.2,-1.9 0,-2.8 -0.8,-5.2 -1.2,-3.5 -1.2,-4.1 -0.1,-6 0.8,-1.3 1.2,-1.6 2.5,-1.8 0.9,-0.1 3.4,-1 5.7,-2.1 2.3,-1 4.9,-2 5.9,-2.1 1.7,-0.2 1.8,-0.2 2.6,1 0.4,0.7 1.4,2.9 2.1,4.9 2.4,6.7 3,7.1 3.5,2.8 0.4,-3.2 -0.3,-6.4 -2.1,-9.1 -1.4,-2.1 -1.4,-2.4 -0.1,-3.6 2,-1.8 4.5,-2.6 8.5,-2.6 3.5,0 4,-0.1 3.1,-0.9 -0.3,-0.3 -0.3,-0.7 0.2,-1.3 0.8,-1.1 3.2,-3.1 4.3,-3.3 0.4,-0.1 1.1,-0.3 1.6,-0.4 0.7,-0.2 1.1,0.2 2.7,2.5 1.1,1.5 2.3,3.9 2.9,5.6 0.5,1.6 1.2,3 1.4,3.1 1,0.3 1.2,-4.4 0.3,-7.1 -0.5,-1.6 -1.1,-2.6 -3.9,-6.4 -0.6,-0.8 -0.6,-0.9 0.1,-1.4 1.5,-1.1 3.5,-1.9 5.9,-2.3 2.4,-0.4 2.6,-0.5 5,-2.9 2.5,-2.5 3.3,-2.9 6.6,-3.7 1.6,-0.4 1.9,-0.3 3.3,0.5 0.8,0.5 2.5,1.7 3.7,2.7 1.2,1 2.3,1.9 2.5,1.9 0.7,0 9.7,-5.9 10.1,-6.7 0.3,-0.5 2,-2.4 4,-4.3 3.8,-3.7 5.2,-5.7 6.2,-8.3 1.5,-4.2 1.7,-20.1 0.5,-27.9 -1.1,-6.4 -2.2,-18.6 -2.1,-21.1 0.1,-1.8 0.5,-3.1 1.3,-4.6 1.9,-3.5 4.1,-4.5 10.3,-4.5 h 3.8 l 4.4,2.2 c 5.9,3 7.9,3.3 12.2,2 4,-1.2 6.7,-3.1 9.8,-6.8 2.9,-3.5 6.8,-10.1 8.3,-13.8 2.2,-5.7 5,-8.7 7.9,-8.7 3.3,0 4.7,1.7 6.1,7.3 0.8,3.1 0.8,4 0.9,26.5 0.1,22.1 0.1,23.4 0.9,26.9 0.4,2 1.2,5.6 1.7,7.9 0.5,2.3 1,4.6 1.2,5.1 0.2,0.5 0.7,2.9 1.1,5.4 1.4,7.6 0.6,15.2 -2.3,22.2 -1.7,4.1 -2.9,6.1 -6.5,11.5 -3.9,5.8 -11.3,13.2 -18,18.1 -2.3,1.7 -7.8,6.2 -12.3,10 -9.4,8 -12.2,10.3 -18.5,15 -2.5,1.9 -8,5.9 -12.1,8.9 -4.1,3 -11.1,8 -15.6,11 -4.4,3 -8.7,5.9 -9.4,6.5 -2.8,2.1 -12.3,8.5 -17.3,11.7 -18.4,11.8 -36.7,21.1 -54.9,27.8 -7.8,2.9 -11.2,3.8 -19.6,5.1 -8.5,1.5 -14.9,1.9 -18.3,1.1 z M 363.2,433.2 c 0,-0.1 -0.1,-0.2 -0.2,-0.2 -0.1,0 -0.2,0.1 -0.2,0.2 0,0.1 0.1,0.2 0.2,0.2 0.1,0 0.2,-0.1 0.2,-0.2 z m -203.9,44.1 c -1.5,-0.4 -3,-0.8 -3.1,-1 -0.5,-0.6 -1.2,-6.1 -1.5,-12.7 -0.3,-6.2 -0.8,-9 -1.5,-8.3 -0.4,0.4 -1.8,6.1 -2.3,9.9 -0.3,1.7 -0.3,4.1 -0.2,5.9 l 0.3,3 -1.7,0.5 c -1,0.3 -3.2,0.5 -5.7,0.5 -3.8,0 -4.2,-0.1 -6.4,-1.1 -2.1,-1.1 -2.3,-1.2 -2.8,-3 -0.9,-3.3 -1.2,-7.3 -1.3,-13.7 0,-3.5 -0.2,-6.4 -0.4,-6.4 -0.5,0 -1.4,2.3 -2.1,5.3 -0.5,2.4 -0.8,9.1 -0.5,12.8 0.1,1.2 0,1.3 -1.5,1.6 -2.4,0.5 -5.5,-0.3 -7.4,-1.8 -1.4,-1.2 -1.6,-1.5 -2,-4 -0.8,-4.8 -0.8,-5.7 -0.9,-10.6 0,-2.7 -0.2,-4.8 -0.3,-4.8 -0.6,0 -1.9,3.6 -2.4,6.3 -0.3,1.6 -0.4,4.4 -0.2,6.9 l 0.2,4.1 -1,0.2 c -2,0.5 -4.4,-0.2 -6.2,-1.8 -2.9,-2.5 -3.2,-3.8 -3.5,-11.8 -0.6,-16.6 0.8,-31.4 3.8,-41.6 0.6,-2.1 1.4,-5.1 1.8,-6.6 0.9,-3.8 1.2,-11.8 0.6,-15 -0.4,-2.4 -2.5,-7.7 -3.1,-8.1 -0.2,-0.1 -0.3,2.4 -0.3,5.4 0,6.3 -0.5,8.5 -3,12.5 -1.9,3 -2.5,2.9 -10,-0.7 -3.3,-1.6 -8,-4.2 -10.4,-5.6 -2.4,-1.5 -5.7,-3.5 -7.2,-4.4 -3.2,-1.9 -8.4,-7 -10.9,-10.6 -1.8,-2.5 -4.3,-8.5 -5.4,-12.6 -0.3,-1.2 -0.9,-4.5 -1.4,-7.3 -0.8,-4.9 -0.8,-5.9 -0.5,-19.2 0.4,-17 0.3,-21.8 -0.4,-29.2 -0.7,-6.8 -2.8,-19.9 -4.4,-27.8 -2.7,-13.5 -3.2,-17.2 -2.7,-23.1 0.2,-2.4 0.4,-9.8 0.5,-16.4 0.1,-13.4 0.8,-20 3.1,-33.2 3.8,-21.2 12.4,-44.9 22.7,-62.2 13.7,-23.1 34.5,-44 57.8,-58.1 6,-3.6 16.9,-9.1 22.4,-11.3 6.3,-2.5 22.2,-7.9 28.1,-9.6 17.9,-5.1 36.2,-8.1 57,-9.5 7.2,-0.5 26.7,-0.5 33.9,0 35.5,2.4 67.6,10 97.5,23.3 30.2,13.4 56.9,33.9 73.6,56.5 9.1,12.3 14.1,22.8 20.4,42.9 3,9.5 5.3,21.7 6.3,33.6 0.5,5.7 0.5,22.3 0,28.5 -2.2,27.5 -9.5,53.2 -21.7,76.4 -14.1,26.8 -31.9,47 -53.6,60.8 -8.9,5.6 -21.4,11 -25.6,11 -2.2,0 -2.6,-0.5 -2.1,-2.9 0.2,-1.1 0.4,-4.1 0.4,-6.7 0,-5.6 -0.6,-7.7 -3.1,-10.5 -2.9,-3.1 -6.6,-4.2 -9.6,-2.8 -1,0.5 -4.3,3.2 -8.2,6.9 -6.3,5.9 -10.9,9.4 -14.3,10.7 -7,2.8 -22.9,5.1 -41.9,6 -7.5,0.4 -15.7,1 -16.7,1.3 -0.3,0.1 -2.4,0.3 -4.6,0.6 -4.5,0.5 -12.1,2.5 -15.4,4.1 -2.6,1.2 -5.4,3.2 -5.4,3.7 0,0.7 1.8,0.4 4.3,-0.7 2.6,-1.1 7.5,-2.5 7.8,-2.2 0.1,0.1 -0.5,1.6 -1.3,3.3 -2.1,4.3 -2.5,6.4 -2.2,11.5 0.2,3.3 0.5,5 1.4,8.1 2.6,8.3 1,15.2 -4.1,17.5 -1.4,0.6 -1.5,0.8 -2.6,3.9 -1.2,3.2 -4.9,6.3 -8.1,6.7 -1,0.1 -1.1,0 -1.8,-1.9 -0.4,-1.1 -1.3,-3.2 -2.1,-4.6 -1.4,-2.6 -4.2,-5.7 -4.7,-5.2 -0.2,0.1 0.7,3 1.9,6.4 1.2,3.4 2.2,6.6 2.2,7.1 0,1.3 -1.9,3.7 -4,5 -1,0.6 -3,1.4 -4.5,1.8 -2.4,0.6 -3.1,0.9 -5.2,2.8 -2.8,2.5 -4.4,3.2 -6.7,3.2 h -1.7 l -0.9,-3.2 c -0.9,-3.3 -4.1,-10.1 -4.7,-10.1 -0.6,0 -0.4,1 1.2,7 1.9,7.2 1.9,7.7 0.1,9.7 -2.9,3.1 -9.6,4.8 -14,3.6 l -1.4,-0.4 -0.1,-2.9 c -0.1,-3.3 -1.5,-9.1 -3,-12.2 -1.1,-2.4 -2.5,-4.4 -3,-4.4 -0.5,0 0,4.2 1.1,9.6 0.5,2.5 1.1,5.7 1.2,7 l 0.3,2.4 -2,1.7 c -4.6,4 -9.7,5 -16,3.4 l -2,-0.5 -0.2,-2.9 c -0.5,-5.7 -3.5,-16 -4.7,-16 -1,0 -1,4.4 -0.1,10.2 0.5,3 0.9,6.2 0.9,7 0,1.4 -0.1,1.5 -1.9,2.4 -2.8,1.5 -8.8,1.7 -13,0.7 z m 3.1,-84.6 c 0.5,-0.5 1.5,-1.9 2.2,-3.2 1.2,-2.4 1.3,-2.5 1.3,-7.6 0,-4.7 -0.1,-5.6 -1.2,-9.6 -2.7,-9.9 -10.3,-23.8 -17.7,-32.3 -2.9,-3.3 -4,-4.2 -6.5,-5.5 -2.2,-1.1 -3.4,-1 -5.1,0.3 -1.7,1.3 -1.7,1.4 -2.3,6.6 -0.5,4.9 -1.2,8.6 -2.9,16.1 -2.1,9.6 -3.4,19.4 -3.1,24.6 0.3,4.7 0.7,6.3 1.9,7.6 1.5,1.6 4.2,0.6 5.6,-2.1 2,-3.8 2.6,-9.2 3,-25.3 0.2,-10.6 0.3,-12 0.8,-11.6 0.9,0.7 5.7,10.3 6.6,13.3 2.4,7.5 6.4,18.6 7.8,21.4 1.2,2.4 2.2,3.7 4.2,5.6 2.8,2.8 3.8,3.1 5.4,1.7 z M 244,348.4 c 6.5,-0.8 13.2,-2.6 18.1,-5 2.5,-1.2 9.7,-7 12.1,-9.6 4.5,-5 6.4,-8.4 9,-16.2 2.3,-6.9 2.9,-10.6 2.9,-18.6 0,-10.1 -1.3,-16 -5.5,-24 -5.6,-10.7 -12.6,-18.8 -21.1,-24.3 -5.8,-3.8 -15.2,-8.1 -21.6,-9.9 -4.6,-1.3 -13,-2.8 -17.2,-3 -9.5,-0.6 -19.6,2.3 -26.1,7.5 -3.3,2.6 -7.3,8.9 -9.3,14.7 -1.3,3.7 -1.5,4.5 -1.6,8.7 -0.2,7.6 0.6,20 1.9,28.4 0.6,4.2 1.4,9.6 1.8,12 0.7,5.4 1.3,7.8 3.1,13.2 1.7,5.2 3,7.5 5.8,11 4.6,5.7 10.4,9.4 19.9,12.6 8,2.7 11.6,3.3 19.1,3.1 2.9,-0.1 6.9,-0.4 8.7,-0.6 z M 103.6,335.9 c 9.2,-3.4 14.1,-7.6 18.2,-15.3 4.9,-9.4 7.9,-31 6.1,-43.5 -1.5,-10.3 -5.3,-19.9 -10.5,-26.5 -2.4,-3 -9.3,-9 -12,-10.3 -2.4,-1.2 -7.1,-2.4 -10.5,-2.7 -2.5,-0.3 -8,0.7 -11.6,2 -1.2,0.4 -3.3,1.6 -4.6,2.5 -3.5,2.6 -5.7,5.4 -7.7,9.9 l -1.7,3.9 0.1,29.9 c 0.1,21.8 0.2,30.4 0.6,31.9 0.7,3 4.9,10.9 7,13.1 1.2,1.2 3,2.5 5.6,3.9 4.3,2.3 7.1,2.9 12.7,3 3.3,0.1 3.7,0 8.3,-1.8 z M 64.4,320.2 c -0.1,-0.1 -0.3,0 -0.3,0.2 0,0.3 0.1,0.4 0.3,0.2 0.2,-0.1 0.2,-0.3 0,-0.4 z m -0.6,-14.4 c 0,-0.1 -0.1,-0.2 -0.2,-0.2 -0.1,0 -0.2,0.1 -0.2,0.2 0,0.1 0.1,0.2 0.2,0.2 0.1,0 0.2,-0.1 0.2,-0.2 z" />
+ id="path968"
+ class="st2"
+ d="m 167.8,601.5 c -3.5,-0.8 -5.5,-1.7 -9.6,-4.6 -4.1,-2.8 -6.6,-5.5 -9.4,-10.2 -5,-8.3 -7.4,-17.6 -7.9,-30.1 l -0.3,-6.8 -1.6,-3.7 c -0.9,-2 -2.9,-6.6 -4.4,-10.2 -1.6,-3.6 -3.4,-8 -4.1,-9.8 -2,-5.7 -4.7,-14.2 -4.7,-14.9 0,-1.9 5.3,-4.6 7.4,-3.7 1.4,0.6 1.9,1.6 1.5,3 -0.7,2.3 -0.2,8.4 0.9,11.2 0.6,1.5 2.6,4.6 3.1,4.6 0.5,0 0.4,-2.7 -0.1,-4.8 -0.8,-3.5 -1.4,-9.2 -1.1,-10.4 0.6,-2 4.2,-3.3 6.4,-2.4 1.1,0.5 1.1,0.8 0.3,2.7 -1,2.1 -1,10.7 0,13.1 0.7,1.7 1.6,2.5 2,1.8 0.1,-0.2 0.3,-2.6 0.4,-5.4 0.3,-8.9 1.4,-11.2 5.6,-11.2 1.9,0 3.6,1.2 4.4,3.3 0.5,1.2 0.5,1.8 0.2,3.6 -0.5,2.8 -0.3,5.7 0.8,8.3 1.6,4 2.4,2.2 2.5,-5.6 0.1,-4.3 0.6,-6.3 1.8,-7.3 1,-0.8 3.5,-1 4.8,-0.3 2.1,1 2.2,1.4 2.1,5.9 -0.1,2.3 0.1,4.9 0.3,6 0.5,2.1 1.8,5 2.3,5 0.5,0 0.7,-2.5 0.8,-8.4 l 0.1,-5.3 1.3,-1.1 c 2.2,-1.7 4.1,-2.6 6.7,-2.8 l 2.4,-0.2 0.8,1.4 c 0.6,1.1 0.9,2.3 1,5.1 0.2,4.2 1,7.1 2.2,8.1 1.4,1.2 1.6,0.2 1.3,-7.4 l -0.2,-7 1.1,-1 c 0.6,-0.5 1.8,-1.2 2.7,-1.4 1.4,-0.4 1.8,-0.3 3.1,0.3 1.4,0.7 1.5,0.9 1.7,2.7 0.3,2.6 1.6,6.4 2.9,8.1 1.9,2.6 2,1.8 1,-6.5 -0.7,-5.6 -0.7,-5.1 0.6,-6.6 1.9,-2 7.1,-3.7 8.8,-2.9 0.5,0.3 1.1,1.5 1.8,3.6 2.5,7.8 3.1,9.5 3.6,9.6 0.7,0.2 1.3,-1.2 1.5,-3.7 0.2,-1.9 0,-2.8 -0.8,-5.2 -1.2,-3.5 -1.2,-4.1 -0.1,-6 0.8,-1.3 1.2,-1.6 2.5,-1.8 0.9,-0.1 3.4,-1 5.7,-2.1 2.3,-1 4.9,-2 5.9,-2.1 1.7,-0.2 1.8,-0.2 2.6,1 0.4,0.7 1.4,2.9 2.1,4.9 2.4,6.7 3,7.1 3.5,2.8 0.4,-3.2 -0.3,-6.4 -2.1,-9.1 -1.4,-2.1 -1.4,-2.4 -0.1,-3.6 2,-1.8 4.5,-2.6 8.5,-2.6 3.5,0 4,-0.1 3.1,-0.9 -0.3,-0.3 -0.3,-0.7 0.2,-1.3 0.8,-1.1 3.2,-3.1 4.3,-3.3 0.4,-0.1 1.1,-0.3 1.6,-0.4 0.7,-0.2 1.1,0.2 2.7,2.5 1.1,1.5 2.3,3.9 2.9,5.6 0.5,1.6 1.2,3 1.4,3.1 1,0.3 1.2,-4.4 0.3,-7.1 -0.5,-1.6 -1.1,-2.6 -3.9,-6.4 -0.6,-0.8 -0.6,-0.9 0.1,-1.4 1.5,-1.1 3.5,-1.9 5.9,-2.3 2.4,-0.4 2.6,-0.5 5,-2.9 2.5,-2.5 3.3,-2.9 6.6,-3.7 1.6,-0.4 1.9,-0.3 3.3,0.5 0.8,0.5 2.5,1.7 3.7,2.7 1.2,1 2.3,1.9 2.5,1.9 0.7,0 9.7,-5.9 10.1,-6.7 0.3,-0.5 2,-2.4 4,-4.3 3.8,-3.7 5.2,-5.7 6.2,-8.3 1.5,-4.2 1.7,-20.1 0.5,-27.9 -1.1,-6.4 -2.2,-18.6 -2.1,-21.1 0.1,-1.8 0.5,-3.1 1.3,-4.6 1.9,-3.5 4.1,-4.5 10.3,-4.5 h 3.8 l 4.4,2.2 c 5.9,3 7.9,3.3 12.2,2 4,-1.2 6.7,-3.1 9.8,-6.8 2.9,-3.5 6.8,-10.1 8.3,-13.8 2.2,-5.7 5,-8.7 7.9,-8.7 3.3,0 4.7,1.7 6.1,7.3 0.8,3.1 0.8,4 0.9,26.5 0.1,22.1 0.1,23.4 0.9,26.9 0.4,2 1.2,5.6 1.7,7.9 0.5,2.3 1,4.6 1.2,5.1 0.2,0.5 0.7,2.9 1.1,5.4 1.4,7.6 0.6,15.2 -2.3,22.2 -1.7,4.1 -2.9,6.1 -6.5,11.5 -3.9,5.8 -11.3,13.2 -18,18.1 -2.3,1.7 -7.8,6.2 -12.3,10 -9.4,8 -12.2,10.3 -18.5,15 -2.5,1.9 -8,5.9 -12.1,8.9 -4.1,3 -11.1,8 -15.6,11 -4.4,3 -8.7,5.9 -9.4,6.5 -2.8,2.1 -12.3,8.5 -17.3,11.7 -18.4,11.8 -36.7,21.1 -54.9,27.8 -7.8,2.9 -11.2,3.8 -19.6,5.1 -8.5,1.5 -14.9,1.9 -18.3,1.1 z M 363.2,433.2 c 0,-0.1 -0.1,-0.2 -0.2,-0.2 -0.1,0 -0.2,0.1 -0.2,0.2 0,0.1 0.1,0.2 0.2,0.2 0.1,0 0.2,-0.1 0.2,-0.2 z m -203.9,44.1 c -1.5,-0.4 -3,-0.8 -3.1,-1 -0.5,-0.6 -1.2,-6.1 -1.5,-12.7 -0.3,-6.2 -0.8,-9 -1.5,-8.3 -0.4,0.4 -1.8,6.1 -2.3,9.9 -0.3,1.7 -0.3,4.1 -0.2,5.9 l 0.3,3 -1.7,0.5 c -1,0.3 -3.2,0.5 -5.7,0.5 -3.8,0 -4.2,-0.1 -6.4,-1.1 -2.1,-1.1 -2.3,-1.2 -2.8,-3 -0.9,-3.3 -1.2,-7.3 -1.3,-13.7 0,-3.5 -0.2,-6.4 -0.4,-6.4 -0.5,0 -1.4,2.3 -2.1,5.3 -0.5,2.4 -0.8,9.1 -0.5,12.8 0.1,1.2 0,1.3 -1.5,1.6 -2.4,0.5 -5.5,-0.3 -7.4,-1.8 -1.4,-1.2 -1.6,-1.5 -2,-4 -0.8,-4.8 -0.8,-5.7 -0.9,-10.6 0,-2.7 -0.2,-4.8 -0.3,-4.8 -0.6,0 -1.9,3.6 -2.4,6.3 -0.3,1.6 -0.4,4.4 -0.2,6.9 l 0.2,4.1 -1,0.2 c -2,0.5 -4.4,-0.2 -6.2,-1.8 -2.9,-2.5 -3.2,-3.8 -3.5,-11.8 -0.6,-16.6 0.8,-31.4 3.8,-41.6 0.6,-2.1 1.4,-5.1 1.8,-6.6 0.9,-3.8 1.2,-11.8 0.6,-15 -0.4,-2.4 -2.5,-7.7 -3.1,-8.1 -0.2,-0.1 -0.3,2.4 -0.3,5.4 0,6.3 -0.5,8.5 -3,12.5 -1.9,3 -2.5,2.9 -10,-0.7 -3.3,-1.6 -8,-4.2 -10.4,-5.6 -2.4,-1.5 -5.7,-3.5 -7.2,-4.4 -3.2,-1.9 -8.4,-7 -10.9,-10.6 -1.8,-2.5 -4.3,-8.5 -5.4,-12.6 -0.3,-1.2 -0.9,-4.5 -1.4,-7.3 -0.8,-4.9 -0.8,-5.9 -0.5,-19.2 0.4,-17 0.3,-21.8 -0.4,-29.2 -0.7,-6.8 -2.8,-19.9 -4.4,-27.8 -2.7,-13.5 -3.2,-17.2 -2.7,-23.1 0.2,-2.4 0.4,-9.8 0.5,-16.4 0.1,-13.4 0.8,-20 3.1,-33.2 3.8,-21.2 12.4,-44.9 22.7,-62.2 13.7,-23.1 34.5,-44 57.8,-58.1 6,-3.6 16.9,-9.1 22.4,-11.3 6.3,-2.5 22.2,-7.9 28.1,-9.6 17.9,-5.1 36.2,-8.1 57,-9.5 7.2,-0.5 26.7,-0.5 33.9,0 35.5,2.4 67.6,10 97.5,23.3 30.2,13.4 56.9,33.9 73.6,56.5 9.1,12.3 14.1,22.8 20.4,42.9 3,9.5 5.3,21.7 6.3,33.6 0.5,5.7 0.5,22.3 0,28.5 -2.2,27.5 -9.5,53.2 -21.7,76.4 -14.1,26.8 -31.9,47 -53.6,60.8 -8.9,5.6 -21.4,11 -25.6,11 -2.2,0 -2.6,-0.5 -2.1,-2.9 0.2,-1.1 0.4,-4.1 0.4,-6.7 0,-5.6 -0.6,-7.7 -3.1,-10.5 -2.9,-3.1 -6.6,-4.2 -9.6,-2.8 -1,0.5 -4.3,3.2 -8.2,6.9 -6.3,5.9 -10.9,9.4 -14.3,10.7 -7,2.8 -22.9,5.1 -41.9,6 -7.5,0.4 -15.7,1 -16.7,1.3 -0.3,0.1 -2.4,0.3 -4.6,0.6 -4.5,0.5 -12.1,2.5 -15.4,4.1 -2.6,1.2 -5.4,3.2 -5.4,3.7 0,0.7 1.8,0.4 4.3,-0.7 2.6,-1.1 7.5,-2.5 7.8,-2.2 0.1,0.1 -0.5,1.6 -1.3,3.3 -2.1,4.3 -2.5,6.4 -2.2,11.5 0.2,3.3 0.5,5 1.4,8.1 2.6,8.3 1,15.2 -4.1,17.5 -1.4,0.6 -1.5,0.8 -2.6,3.9 -1.2,3.2 -4.9,6.3 -8.1,6.7 -1,0.1 -1.1,0 -1.8,-1.9 -0.4,-1.1 -1.3,-3.2 -2.1,-4.6 -1.4,-2.6 -4.2,-5.7 -4.7,-5.2 -0.2,0.1 0.7,3 1.9,6.4 1.2,3.4 2.2,6.6 2.2,7.1 0,1.3 -1.9,3.7 -4,5 -1,0.6 -3,1.4 -4.5,1.8 -2.4,0.6 -3.1,0.9 -5.2,2.8 -2.8,2.5 -4.4,3.2 -6.7,3.2 h -1.7 l -0.9,-3.2 c -0.9,-3.3 -4.1,-10.1 -4.7,-10.1 -0.6,0 -0.4,1 1.2,7 1.9,7.2 1.9,7.7 0.1,9.7 -2.9,3.1 -9.6,4.8 -14,3.6 l -1.4,-0.4 -0.1,-2.9 c -0.1,-3.3 -1.5,-9.1 -3,-12.2 -1.1,-2.4 -2.5,-4.4 -3,-4.4 -0.5,0 0,4.2 1.1,9.6 0.5,2.5 1.1,5.7 1.2,7 l 0.3,2.4 -2,1.7 c -4.6,4 -9.7,5 -16,3.4 l -2,-0.5 -0.2,-2.9 c -0.5,-5.7 -3.5,-16 -4.7,-16 -1,0 -1,4.4 -0.1,10.2 0.5,3 0.9,6.2 0.9,7 0,1.4 -0.1,1.5 -1.9,2.4 -2.8,1.5 -8.8,1.7 -13,0.7 z m 3.1,-84.6 c 0.5,-0.5 1.5,-1.9 2.2,-3.2 1.2,-2.4 1.3,-2.5 1.3,-7.6 0,-4.7 -0.1,-5.6 -1.2,-9.6 -2.7,-9.9 -10.3,-23.8 -17.7,-32.3 -2.9,-3.3 -4,-4.2 -6.5,-5.5 -2.2,-1.1 -3.4,-1 -5.1,0.3 -1.7,1.3 -1.7,1.4 -2.3,6.6 -0.5,4.9 -1.2,8.6 -2.9,16.1 -2.1,9.6 -3.4,19.4 -3.1,24.6 0.3,4.7 0.7,6.3 1.9,7.6 1.5,1.6 4.2,0.6 5.6,-2.1 2,-3.8 2.6,-9.2 3,-25.3 0.2,-10.6 0.3,-12 0.8,-11.6 0.9,0.7 5.7,10.3 6.6,13.3 2.4,7.5 6.4,18.6 7.8,21.4 1.2,2.4 2.2,3.7 4.2,5.6 2.8,2.8 3.8,3.1 5.4,1.7 z M 244,348.4 c 6.5,-0.8 13.2,-2.6 18.1,-5 2.5,-1.2 9.7,-7 12.1,-9.6 4.5,-5 6.4,-8.4 9,-16.2 2.3,-6.9 2.9,-10.6 2.9,-18.6 0,-10.1 -1.3,-16 -5.5,-24 -5.6,-10.7 -12.6,-18.8 -21.1,-24.3 -5.8,-3.8 -15.2,-8.1 -21.6,-9.9 -4.6,-1.3 -13,-2.8 -17.2,-3 -9.5,-0.6 -19.6,2.3 -26.1,7.5 -3.3,2.6 -7.3,8.9 -9.3,14.7 -1.3,3.7 -1.5,4.5 -1.6,8.7 -0.2,7.6 0.6,20 1.9,28.4 0.6,4.2 1.4,9.6 1.8,12 0.7,5.4 1.3,7.8 3.1,13.2 1.7,5.2 3,7.5 5.8,11 4.6,5.7 10.4,9.4 19.9,12.6 8,2.7 11.6,3.3 19.1,3.1 2.9,-0.1 6.9,-0.4 8.7,-0.6 z M 103.6,335.9 c 9.2,-3.4 14.1,-7.6 18.2,-15.3 4.9,-9.4 7.9,-31 6.1,-43.5 -1.5,-10.3 -5.3,-19.9 -10.5,-26.5 -2.4,-3 -9.3,-9 -12,-10.3 -2.4,-1.2 -7.1,-2.4 -10.5,-2.7 -2.5,-0.3 -8,0.7 -11.6,2 -1.2,0.4 -3.3,1.6 -4.6,2.5 -3.5,2.6 -5.7,5.4 -7.7,9.9 l -1.7,3.9 0.1,29.9 c 0.1,21.8 0.2,30.4 0.6,31.9 0.7,3 4.9,10.9 7,13.1 1.2,1.2 3,2.5 5.6,3.9 4.3,2.3 7.1,2.9 12.7,3 3.3,0.1 3.7,0 8.3,-1.8 z M 64.4,320.2 c -0.1,-0.1 -0.3,0 -0.3,0.2 0,0.3 0.1,0.4 0.3,0.2 0.2,-0.1 0.2,-0.3 0,-0.4 z m -0.6,-14.4 c 0,-0.1 -0.1,-0.2 -0.2,-0.2 -0.1,0 -0.2,0.1 -0.2,0.2 0,0.1 0.1,0.2 0.2,0.2 0.1,0 0.2,-0.1 0.2,-0.2 z"/>
<path
- id="path988"
- class="st3"
- d="m 167.8,601.5 c -3.5,-0.8 -5.5,-1.7 -9.6,-4.6 -4.1,-2.8 -6.6,-5.5 -9.4,-10.2 -5,-8.3 -7.4,-17.6 -7.9,-30.1 l -0.3,-6.8 -1.6,-3.7 c -0.9,-2 -2.9,-6.6 -4.4,-10.2 -1.6,-3.6 -3.4,-8 -4.1,-9.8 -2,-5.7 -4.7,-14.2 -4.7,-14.9 0,-1.9 5.3,-4.6 7.4,-3.7 1.4,0.6 1.9,1.6 1.5,3 -0.7,2.3 -0.2,8.4 0.9,11.2 0.6,1.5 2.6,4.6 3.1,4.6 0.5,0 0.4,-2.7 -0.1,-4.8 -0.8,-3.5 -1.4,-9.2 -1.1,-10.4 0.6,-2 4.2,-3.3 6.4,-2.4 1.1,0.5 1.1,0.8 0.3,2.7 -1,2.1 -1,10.7 0,13.1 0.7,1.7 1.6,2.5 2,1.8 0.1,-0.2 0.3,-2.6 0.4,-5.4 0.3,-8.9 1.4,-11.2 5.6,-11.2 1.9,0 3.6,1.2 4.4,3.3 0.5,1.2 0.5,1.8 0.2,3.6 -0.5,2.8 -0.3,5.7 0.8,8.3 1.6,4 2.4,2.2 2.5,-5.6 0.1,-4.3 0.6,-6.3 1.8,-7.3 1,-0.8 3.5,-1 4.8,-0.3 2.1,1 2.2,1.4 2.1,5.9 -0.1,2.3 0.1,4.9 0.3,6 0.5,2.1 1.8,5 2.3,5 0.5,0 0.7,-2.5 0.8,-8.4 l 0.1,-5.3 1.3,-1.1 c 2.2,-1.7 4.1,-2.6 6.7,-2.8 l 2.4,-0.2 0.8,1.4 c 0.6,1.1 0.9,2.3 1,5.1 0.2,4.2 1,7.1 2.2,8.1 1.4,1.2 1.6,0.2 1.3,-7.4 l -0.2,-7 1.1,-1 c 0.6,-0.5 1.8,-1.2 2.7,-1.4 1.4,-0.4 1.8,-0.3 3.1,0.3 1.4,0.7 1.5,0.9 1.7,2.7 0.3,2.6 1.6,6.4 2.9,8.1 1.9,2.6 2,1.8 1,-6.5 -0.7,-5.6 -0.7,-5.1 0.6,-6.6 1.9,-2 7.1,-3.7 8.8,-2.9 0.5,0.3 1.1,1.5 1.8,3.6 2.5,7.8 3.1,9.5 3.6,9.6 0.7,0.2 1.3,-1.2 1.5,-3.7 0.2,-1.9 0,-2.8 -0.8,-5.2 -1.2,-3.5 -1.2,-4.1 -0.1,-6 0.8,-1.3 1.2,-1.6 2.5,-1.8 0.9,-0.1 3.4,-1 5.7,-2.1 2.3,-1 4.9,-2 5.9,-2.1 1.7,-0.2 1.8,-0.2 2.6,1 0.4,0.7 1.4,2.9 2.1,4.9 2.4,6.7 3,7.1 3.5,2.8 0.4,-3.2 -0.3,-6.4 -2.1,-9.1 -1.4,-2.1 -1.4,-2.4 -0.1,-3.6 2,-1.8 4.5,-2.6 8.5,-2.6 3.5,0 4,-0.1 3.1,-0.9 -0.3,-0.3 -0.3,-0.7 0.2,-1.3 0.8,-1.1 3.2,-3.1 4.3,-3.3 0.4,-0.1 1.1,-0.3 1.6,-0.4 0.7,-0.2 1.1,0.2 2.7,2.5 1.1,1.5 2.3,3.9 2.9,5.6 0.5,1.6 1.2,3 1.4,3.1 1,0.3 1.2,-4.4 0.3,-7.1 -0.5,-1.6 -1.1,-2.6 -3.9,-6.4 -0.6,-0.8 -0.6,-0.9 0.1,-1.4 1.5,-1.1 3.5,-1.9 5.9,-2.3 2.4,-0.4 2.6,-0.5 5,-2.9 2.5,-2.5 3.3,-2.9 6.6,-3.7 1.6,-0.4 1.9,-0.3 3.3,0.5 0.8,0.5 2.5,1.7 3.7,2.7 1.2,1 2.3,1.9 2.5,1.9 0.7,0 9.7,-5.9 10.1,-6.7 0.3,-0.5 2,-2.4 4,-4.3 3.8,-3.7 5.2,-5.7 6.2,-8.3 1.5,-4.2 1.7,-20.1 0.5,-27.9 -1.1,-6.4 -2.2,-18.6 -2.1,-21.1 0.1,-1.8 0.5,-3.1 1.3,-4.6 1.9,-3.5 4.1,-4.5 10.3,-4.5 h 3.8 l 4.4,2.2 c 5.9,3 7.9,3.3 12.2,2 4,-1.2 6.7,-3.1 9.8,-6.8 2.9,-3.5 6.8,-10.1 8.3,-13.8 2.2,-5.7 5,-8.7 7.9,-8.7 3.3,0 4.7,1.7 6.1,7.3 0.8,3.1 0.8,4 0.9,26.5 0.1,22.1 0.1,23.4 0.9,26.9 0.4,2 1.2,5.6 1.7,7.9 0.5,2.3 1,4.6 1.2,5.1 0.2,0.5 0.7,2.9 1.1,5.4 1.4,7.6 0.6,15.2 -2.3,22.2 -1.7,4.1 -2.9,6.1 -6.5,11.5 -3.9,5.8 -11.3,13.2 -18,18.1 -2.3,1.7 -7.8,6.2 -12.3,10 -9.4,8 -12.2,10.3 -18.5,15 -2.5,1.9 -8,5.9 -12.1,8.9 -4.1,3 -11.1,8 -15.6,11 -4.4,3 -8.7,5.9 -9.4,6.5 -2.8,2.1 -12.3,8.5 -17.3,11.7 -18.4,11.8 -36.7,21.1 -54.9,27.8 -7.8,2.9 -11.2,3.8 -19.6,5.1 -8.5,1.5 -14.9,1.9 -18.3,1.1 z M 363.2,433.2 c 0,-0.1 -0.1,-0.2 -0.2,-0.2 -0.1,0 -0.2,0.1 -0.2,0.2 0,0.1 0.1,0.2 0.2,0.2 0.1,0 0.2,-0.1 0.2,-0.2 z m -203.9,44.1 c -1.5,-0.4 -3,-0.8 -3.1,-1 -0.5,-0.6 -1.2,-6.1 -1.5,-12.7 -0.3,-6.2 -0.8,-9 -1.5,-8.3 -0.4,0.4 -1.8,6.1 -2.3,9.9 -0.3,1.7 -0.3,4.1 -0.2,5.9 l 0.3,3 -1.7,0.5 c -1,0.3 -3.2,0.5 -5.7,0.5 -3.8,0 -4.2,-0.1 -6.4,-1.1 -2.1,-1.1 -2.3,-1.2 -2.8,-3 -0.9,-3.3 -1.2,-7.3 -1.3,-13.7 0,-3.5 -0.2,-6.4 -0.4,-6.4 -0.5,0 -1.4,2.3 -2.1,5.3 -0.5,2.4 -0.8,9.1 -0.5,12.8 0.1,1.2 0,1.3 -1.5,1.6 -2.4,0.5 -5.5,-0.3 -7.4,-1.8 -1.4,-1.2 -1.6,-1.5 -2,-4 -0.8,-4.8 -0.8,-5.7 -0.9,-10.6 0,-2.7 -0.2,-4.8 -0.3,-4.8 -0.6,0 -1.9,3.6 -2.4,6.3 -0.3,1.6 -0.4,4.4 -0.2,6.9 l 0.2,4.1 -1,0.2 c -2,0.5 -4.4,-0.2 -6.2,-1.8 -2.9,-2.5 -3.2,-3.8 -3.5,-11.8 -0.6,-16.6 0.8,-31.4 3.8,-41.6 0.6,-2.1 1.4,-5.1 1.8,-6.6 0.9,-3.8 1.2,-11.8 0.6,-15 -0.4,-2.4 -2.5,-7.7 -3.1,-8.1 -0.2,-0.1 -0.3,2.4 -0.3,5.4 0,6.3 -0.5,8.5 -3,12.5 -1.9,3 -2.5,2.9 -10,-0.7 -3.3,-1.6 -8,-4.2 -10.4,-5.6 -2.4,-1.5 -5.7,-3.5 -7.2,-4.4 -3.2,-1.9 -8.4,-7 -10.9,-10.6 -1.8,-2.5 -4.3,-8.5 -5.4,-12.6 -0.3,-1.2 -0.9,-4.5 -1.4,-7.3 -0.8,-4.9 -0.8,-5.9 -0.5,-19.2 0.4,-17 0.3,-21.8 -0.4,-29.2 -0.7,-6.8 -2.8,-19.9 -4.4,-27.8 -2.7,-13.5 -3.2,-17.2 -2.7,-23.1 0.2,-2.4 0.4,-9.8 0.5,-16.4 0.1,-13.4 0.8,-20 3.1,-33.2 3.8,-21.2 12.4,-44.9 22.7,-62.2 13.7,-23.1 34.5,-44 57.8,-58.1 6,-3.6 16.9,-9.1 22.4,-11.3 6.3,-2.5 22.2,-7.9 28.1,-9.6 17.9,-5.1 36.2,-8.1 57,-9.5 7.2,-0.5 26.7,-0.5 33.9,0 35.5,2.4 67.6,10 97.5,23.3 30.2,13.4 56.9,33.9 73.6,56.5 9.1,12.3 14.1,22.8 20.4,42.9 3,9.5 5.3,21.7 6.3,33.6 0.5,5.7 0.5,22.3 0,28.5 -2.2,27.5 -9.5,53.2 -21.7,76.4 -14.1,26.8 -31.9,47 -53.6,60.8 -8.9,5.6 -21.4,11 -25.6,11 -2.2,0 -2.6,-0.5 -2.1,-2.9 0.2,-1.1 0.4,-4.1 0.4,-6.7 0,-5.6 -0.6,-7.7 -3.1,-10.5 -2.9,-3.1 -6.6,-4.2 -9.6,-2.8 -1,0.5 -4.3,3.2 -8.2,6.9 -6.3,5.9 -10.9,9.4 -14.3,10.7 -7,2.8 -22.9,5.1 -41.9,6 -7.5,0.4 -15.7,1 -16.7,1.3 -0.3,0.1 -2.4,0.3 -4.6,0.6 -4.5,0.5 -12.1,2.5 -15.4,4.1 -2.6,1.2 -5.4,3.2 -5.4,3.7 0,0.7 1.8,0.4 4.3,-0.7 2.6,-1.1 7.5,-2.5 7.8,-2.2 0.1,0.1 -0.5,1.6 -1.3,3.3 -2.1,4.3 -2.5,6.4 -2.2,11.5 0.2,3.3 0.5,5 1.4,8.1 2.6,8.3 1,15.2 -4.1,17.5 -1.4,0.6 -1.5,0.8 -2.6,3.9 -1.2,3.2 -4.9,6.3 -8.1,6.7 -1,0.1 -1.1,0 -1.8,-1.9 -0.4,-1.1 -1.3,-3.2 -2.1,-4.6 -1.4,-2.6 -4.2,-5.7 -4.7,-5.2 -0.2,0.1 0.7,3 1.9,6.4 1.2,3.4 2.2,6.6 2.2,7.1 0,1.3 -1.9,3.7 -4,5 -1,0.6 -3,1.4 -4.5,1.8 -2.4,0.6 -3.1,0.9 -5.2,2.8 -2.8,2.5 -4.4,3.2 -6.7,3.2 h -1.7 l -0.9,-3.2 c -0.9,-3.3 -4.1,-10.1 -4.7,-10.1 -0.6,0 -0.4,1 1.2,7 1.9,7.2 1.9,7.7 0.1,9.7 -2.9,3.1 -9.6,4.8 -14,3.6 l -1.4,-0.4 -0.1,-2.9 c -0.1,-3.3 -1.5,-9.1 -3,-12.2 -1.1,-2.4 -2.5,-4.4 -3,-4.4 -0.5,0 0,4.2 1.1,9.6 0.5,2.5 1.1,5.7 1.2,7 l 0.3,2.4 -2,1.7 c -4.6,4 -9.7,5 -16,3.4 l -2,-0.5 -0.2,-2.9 c -0.5,-5.7 -3.5,-16 -4.7,-16 -1,0 -1,4.4 -0.1,10.2 0.5,3 0.9,6.2 0.9,7 0,1.4 -0.1,1.5 -1.9,2.4 -2.8,1.5 -8.8,1.7 -13,0.7 z m 3.1,-84.6 c 0.5,-0.5 1.5,-1.9 2.2,-3.2 1.2,-2.4 1.3,-2.5 1.3,-7.6 0,-4.7 -0.1,-5.6 -1.2,-9.6 -2.7,-9.9 -10.3,-23.8 -17.7,-32.3 -2.9,-3.3 -4,-4.2 -6.5,-5.5 -2.2,-1.1 -3.4,-1 -5.1,0.3 -1.7,1.3 -1.7,1.4 -2.3,6.6 -0.5,4.9 -1.2,8.6 -2.9,16.1 -2.1,9.6 -3.4,19.4 -3.1,24.6 0.3,4.7 0.7,6.3 1.9,7.6 1.5,1.6 4.2,0.6 5.6,-2.1 2,-3.8 2.6,-9.2 3,-25.3 0.2,-10.6 0.3,-12 0.8,-11.6 0.9,0.7 5.7,10.3 6.6,13.3 2.4,7.5 6.4,18.6 7.8,21.4 1.2,2.4 2.2,3.7 4.2,5.6 2.8,2.8 3.8,3.1 5.4,1.7 z M 244,348.4 c 6.5,-0.8 13.2,-2.6 18.1,-5 2.5,-1.2 9.7,-7 12.1,-9.6 4.5,-5 6.4,-8.4 9,-16.2 2.3,-6.9 2.9,-10.6 2.9,-18.6 0,-10.1 -1.3,-16 -5.5,-24 -5.6,-10.7 -12.6,-18.8 -21.1,-24.3 -5.8,-3.8 -15.2,-8.1 -21.6,-9.9 -4.6,-1.3 -13,-2.8 -17.2,-3 -9.5,-0.6 -19.6,2.3 -26.1,7.5 -3.3,2.6 -7.3,8.9 -9.3,14.7 -1.3,3.7 -1.5,4.5 -1.6,8.7 -0.2,7.6 0.6,20 1.9,28.4 0.6,4.2 1.4,9.6 1.8,12 0.7,5.4 1.3,7.8 3.1,13.2 1.7,5.2 3,7.5 5.8,11 4.6,5.7 10.4,9.4 19.9,12.6 8,2.7 11.6,3.3 19.1,3.1 2.9,-0.1 6.9,-0.4 8.7,-0.6 z M 103.6,335.9 c 9.2,-3.4 14.1,-7.6 18.2,-15.3 4.9,-9.4 7.9,-31 6.1,-43.5 -1.5,-10.3 -5.3,-19.9 -10.5,-26.5 -2.4,-3 -9.3,-9 -12,-10.3 -2.4,-1.2 -7.1,-2.4 -10.5,-2.7 -2.5,-0.3 -8,0.7 -11.6,2 -1.2,0.4 -3.3,1.6 -4.6,2.5 -3.5,2.6 -5.7,5.4 -7.7,9.9 l -1.7,3.9 0.1,29.9 c 0.1,21.8 0.2,30.4 0.6,31.9 0.7,3 4.9,10.9 7,13.1 1.2,1.2 3,2.5 5.6,3.9 4.3,2.3 7.1,2.9 12.7,3 3.3,0.1 3.7,0 8.3,-1.8 z M 64.4,320.2 c -0.1,-0.1 -0.3,0 -0.3,0.2 0,0.3 0.1,0.4 0.3,0.2 0.2,-0.1 0.2,-0.3 0,-0.4 z m -0.6,-14.4 c 0,-0.1 -0.1,-0.2 -0.2,-0.2 -0.1,0 -0.2,0.1 -0.2,0.2 0,0.1 0.1,0.2 0.2,0.2 0.1,0 0.2,-0.1 0.2,-0.2 z"
- sodipodi:nodetypes="ccccccccssccscccccccsccccccccscccccccccccccccccccccccccccccscsccccccccccssccssccccccscccccscccssccccccsccccccssssscccsccccscccsccccccsccccccccccsccccccccccccccccccccccccccscsccccccccscscccccccccsscccsccsccccccscccccccscsccccscccsccccccccscccccsscccccccccccccccccccccccccccccccsccsssss" />
+ id="path988"
+ class="st3"
+ d="m 167.8,601.5 c -3.5,-0.8 -5.5,-1.7 -9.6,-4.6 -4.1,-2.8 -6.6,-5.5 -9.4,-10.2 -5,-8.3 -7.4,-17.6 -7.9,-30.1 l -0.3,-6.8 -1.6,-3.7 c -0.9,-2 -2.9,-6.6 -4.4,-10.2 -1.6,-3.6 -3.4,-8 -4.1,-9.8 -2,-5.7 -4.7,-14.2 -4.7,-14.9 0,-1.9 5.3,-4.6 7.4,-3.7 1.4,0.6 1.9,1.6 1.5,3 -0.7,2.3 -0.2,8.4 0.9,11.2 0.6,1.5 2.6,4.6 3.1,4.6 0.5,0 0.4,-2.7 -0.1,-4.8 -0.8,-3.5 -1.4,-9.2 -1.1,-10.4 0.6,-2 4.2,-3.3 6.4,-2.4 1.1,0.5 1.1,0.8 0.3,2.7 -1,2.1 -1,10.7 0,13.1 0.7,1.7 1.6,2.5 2,1.8 0.1,-0.2 0.3,-2.6 0.4,-5.4 0.3,-8.9 1.4,-11.2 5.6,-11.2 1.9,0 3.6,1.2 4.4,3.3 0.5,1.2 0.5,1.8 0.2,3.6 -0.5,2.8 -0.3,5.7 0.8,8.3 1.6,4 2.4,2.2 2.5,-5.6 0.1,-4.3 0.6,-6.3 1.8,-7.3 1,-0.8 3.5,-1 4.8,-0.3 2.1,1 2.2,1.4 2.1,5.9 -0.1,2.3 0.1,4.9 0.3,6 0.5,2.1 1.8,5 2.3,5 0.5,0 0.7,-2.5 0.8,-8.4 l 0.1,-5.3 1.3,-1.1 c 2.2,-1.7 4.1,-2.6 6.7,-2.8 l 2.4,-0.2 0.8,1.4 c 0.6,1.1 0.9,2.3 1,5.1 0.2,4.2 1,7.1 2.2,8.1 1.4,1.2 1.6,0.2 1.3,-7.4 l -0.2,-7 1.1,-1 c 0.6,-0.5 1.8,-1.2 2.7,-1.4 1.4,-0.4 1.8,-0.3 3.1,0.3 1.4,0.7 1.5,0.9 1.7,2.7 0.3,2.6 1.6,6.4 2.9,8.1 1.9,2.6 2,1.8 1,-6.5 -0.7,-5.6 -0.7,-5.1 0.6,-6.6 1.9,-2 7.1,-3.7 8.8,-2.9 0.5,0.3 1.1,1.5 1.8,3.6 2.5,7.8 3.1,9.5 3.6,9.6 0.7,0.2 1.3,-1.2 1.5,-3.7 0.2,-1.9 0,-2.8 -0.8,-5.2 -1.2,-3.5 -1.2,-4.1 -0.1,-6 0.8,-1.3 1.2,-1.6 2.5,-1.8 0.9,-0.1 3.4,-1 5.7,-2.1 2.3,-1 4.9,-2 5.9,-2.1 1.7,-0.2 1.8,-0.2 2.6,1 0.4,0.7 1.4,2.9 2.1,4.9 2.4,6.7 3,7.1 3.5,2.8 0.4,-3.2 -0.3,-6.4 -2.1,-9.1 -1.4,-2.1 -1.4,-2.4 -0.1,-3.6 2,-1.8 4.5,-2.6 8.5,-2.6 3.5,0 4,-0.1 3.1,-0.9 -0.3,-0.3 -0.3,-0.7 0.2,-1.3 0.8,-1.1 3.2,-3.1 4.3,-3.3 0.4,-0.1 1.1,-0.3 1.6,-0.4 0.7,-0.2 1.1,0.2 2.7,2.5 1.1,1.5 2.3,3.9 2.9,5.6 0.5,1.6 1.2,3 1.4,3.1 1,0.3 1.2,-4.4 0.3,-7.1 -0.5,-1.6 -1.1,-2.6 -3.9,-6.4 -0.6,-0.8 -0.6,-0.9 0.1,-1.4 1.5,-1.1 3.5,-1.9 5.9,-2.3 2.4,-0.4 2.6,-0.5 5,-2.9 2.5,-2.5 3.3,-2.9 6.6,-3.7 1.6,-0.4 1.9,-0.3 3.3,0.5 0.8,0.5 2.5,1.7 3.7,2.7 1.2,1 2.3,1.9 2.5,1.9 0.7,0 9.7,-5.9 10.1,-6.7 0.3,-0.5 2,-2.4 4,-4.3 3.8,-3.7 5.2,-5.7 6.2,-8.3 1.5,-4.2 1.7,-20.1 0.5,-27.9 -1.1,-6.4 -2.2,-18.6 -2.1,-21.1 0.1,-1.8 0.5,-3.1 1.3,-4.6 1.9,-3.5 4.1,-4.5 10.3,-4.5 h 3.8 l 4.4,2.2 c 5.9,3 7.9,3.3 12.2,2 4,-1.2 6.7,-3.1 9.8,-6.8 2.9,-3.5 6.8,-10.1 8.3,-13.8 2.2,-5.7 5,-8.7 7.9,-8.7 3.3,0 4.7,1.7 6.1,7.3 0.8,3.1 0.8,4 0.9,26.5 0.1,22.1 0.1,23.4 0.9,26.9 0.4,2 1.2,5.6 1.7,7.9 0.5,2.3 1,4.6 1.2,5.1 0.2,0.5 0.7,2.9 1.1,5.4 1.4,7.6 0.6,15.2 -2.3,22.2 -1.7,4.1 -2.9,6.1 -6.5,11.5 -3.9,5.8 -11.3,13.2 -18,18.1 -2.3,1.7 -7.8,6.2 -12.3,10 -9.4,8 -12.2,10.3 -18.5,15 -2.5,1.9 -8,5.9 -12.1,8.9 -4.1,3 -11.1,8 -15.6,11 -4.4,3 -8.7,5.9 -9.4,6.5 -2.8,2.1 -12.3,8.5 -17.3,11.7 -18.4,11.8 -36.7,21.1 -54.9,27.8 -7.8,2.9 -11.2,3.8 -19.6,5.1 -8.5,1.5 -14.9,1.9 -18.3,1.1 z M 363.2,433.2 c 0,-0.1 -0.1,-0.2 -0.2,-0.2 -0.1,0 -0.2,0.1 -0.2,0.2 0,0.1 0.1,0.2 0.2,0.2 0.1,0 0.2,-0.1 0.2,-0.2 z m -203.9,44.1 c -1.5,-0.4 -3,-0.8 -3.1,-1 -0.5,-0.6 -1.2,-6.1 -1.5,-12.7 -0.3,-6.2 -0.8,-9 -1.5,-8.3 -0.4,0.4 -1.8,6.1 -2.3,9.9 -0.3,1.7 -0.3,4.1 -0.2,5.9 l 0.3,3 -1.7,0.5 c -1,0.3 -3.2,0.5 -5.7,0.5 -3.8,0 -4.2,-0.1 -6.4,-1.1 -2.1,-1.1 -2.3,-1.2 -2.8,-3 -0.9,-3.3 -1.2,-7.3 -1.3,-13.7 0,-3.5 -0.2,-6.4 -0.4,-6.4 -0.5,0 -1.4,2.3 -2.1,5.3 -0.5,2.4 -0.8,9.1 -0.5,12.8 0.1,1.2 0,1.3 -1.5,1.6 -2.4,0.5 -5.5,-0.3 -7.4,-1.8 -1.4,-1.2 -1.6,-1.5 -2,-4 -0.8,-4.8 -0.8,-5.7 -0.9,-10.6 0,-2.7 -0.2,-4.8 -0.3,-4.8 -0.6,0 -1.9,3.6 -2.4,6.3 -0.3,1.6 -0.4,4.4 -0.2,6.9 l 0.2,4.1 -1,0.2 c -2,0.5 -4.4,-0.2 -6.2,-1.8 -2.9,-2.5 -3.2,-3.8 -3.5,-11.8 -0.6,-16.6 0.8,-31.4 3.8,-41.6 0.6,-2.1 1.4,-5.1 1.8,-6.6 0.9,-3.8 1.2,-11.8 0.6,-15 -0.4,-2.4 -2.5,-7.7 -3.1,-8.1 -0.2,-0.1 -0.3,2.4 -0.3,5.4 0,6.3 -0.5,8.5 -3,12.5 -1.9,3 -2.5,2.9 -10,-0.7 -3.3,-1.6 -8,-4.2 -10.4,-5.6 -2.4,-1.5 -5.7,-3.5 -7.2,-4.4 -3.2,-1.9 -8.4,-7 -10.9,-10.6 -1.8,-2.5 -4.3,-8.5 -5.4,-12.6 -0.3,-1.2 -0.9,-4.5 -1.4,-7.3 -0.8,-4.9 -0.8,-5.9 -0.5,-19.2 0.4,-17 0.3,-21.8 -0.4,-29.2 -0.7,-6.8 -2.8,-19.9 -4.4,-27.8 -2.7,-13.5 -3.2,-17.2 -2.7,-23.1 0.2,-2.4 0.4,-9.8 0.5,-16.4 0.1,-13.4 0.8,-20 3.1,-33.2 3.8,-21.2 12.4,-44.9 22.7,-62.2 13.7,-23.1 34.5,-44 57.8,-58.1 6,-3.6 16.9,-9.1 22.4,-11.3 6.3,-2.5 22.2,-7.9 28.1,-9.6 17.9,-5.1 36.2,-8.1 57,-9.5 7.2,-0.5 26.7,-0.5 33.9,0 35.5,2.4 67.6,10 97.5,23.3 30.2,13.4 56.9,33.9 73.6,56.5 9.1,12.3 14.1,22.8 20.4,42.9 3,9.5 5.3,21.7 6.3,33.6 0.5,5.7 0.5,22.3 0,28.5 -2.2,27.5 -9.5,53.2 -21.7,76.4 -14.1,26.8 -31.9,47 -53.6,60.8 -8.9,5.6 -21.4,11 -25.6,11 -2.2,0 -2.6,-0.5 -2.1,-2.9 0.2,-1.1 0.4,-4.1 0.4,-6.7 0,-5.6 -0.6,-7.7 -3.1,-10.5 -2.9,-3.1 -6.6,-4.2 -9.6,-2.8 -1,0.5 -4.3,3.2 -8.2,6.9 -6.3,5.9 -10.9,9.4 -14.3,10.7 -7,2.8 -22.9,5.1 -41.9,6 -7.5,0.4 -15.7,1 -16.7,1.3 -0.3,0.1 -2.4,0.3 -4.6,0.6 -4.5,0.5 -12.1,2.5 -15.4,4.1 -2.6,1.2 -5.4,3.2 -5.4,3.7 0,0.7 1.8,0.4 4.3,-0.7 2.6,-1.1 7.5,-2.5 7.8,-2.2 0.1,0.1 -0.5,1.6 -1.3,3.3 -2.1,4.3 -2.5,6.4 -2.2,11.5 0.2,3.3 0.5,5 1.4,8.1 2.6,8.3 1,15.2 -4.1,17.5 -1.4,0.6 -1.5,0.8 -2.6,3.9 -1.2,3.2 -4.9,6.3 -8.1,6.7 -1,0.1 -1.1,0 -1.8,-1.9 -0.4,-1.1 -1.3,-3.2 -2.1,-4.6 -1.4,-2.6 -4.2,-5.7 -4.7,-5.2 -0.2,0.1 0.7,3 1.9,6.4 1.2,3.4 2.2,6.6 2.2,7.1 0,1.3 -1.9,3.7 -4,5 -1,0.6 -3,1.4 -4.5,1.8 -2.4,0.6 -3.1,0.9 -5.2,2.8 -2.8,2.5 -4.4,3.2 -6.7,3.2 h -1.7 l -0.9,-3.2 c -0.9,-3.3 -4.1,-10.1 -4.7,-10.1 -0.6,0 -0.4,1 1.2,7 1.9,7.2 1.9,7.7 0.1,9.7 -2.9,3.1 -9.6,4.8 -14,3.6 l -1.4,-0.4 -0.1,-2.9 c -0.1,-3.3 -1.5,-9.1 -3,-12.2 -1.1,-2.4 -2.5,-4.4 -3,-4.4 -0.5,0 0,4.2 1.1,9.6 0.5,2.5 1.1,5.7 1.2,7 l 0.3,2.4 -2,1.7 c -4.6,4 -9.7,5 -16,3.4 l -2,-0.5 -0.2,-2.9 c -0.5,-5.7 -3.5,-16 -4.7,-16 -1,0 -1,4.4 -0.1,10.2 0.5,3 0.9,6.2 0.9,7 0,1.4 -0.1,1.5 -1.9,2.4 -2.8,1.5 -8.8,1.7 -13,0.7 z m 3.1,-84.6 c 0.5,-0.5 1.5,-1.9 2.2,-3.2 1.2,-2.4 1.3,-2.5 1.3,-7.6 0,-4.7 -0.1,-5.6 -1.2,-9.6 -2.7,-9.9 -10.3,-23.8 -17.7,-32.3 -2.9,-3.3 -4,-4.2 -6.5,-5.5 -2.2,-1.1 -3.4,-1 -5.1,0.3 -1.7,1.3 -1.7,1.4 -2.3,6.6 -0.5,4.9 -1.2,8.6 -2.9,16.1 -2.1,9.6 -3.4,19.4 -3.1,24.6 0.3,4.7 0.7,6.3 1.9,7.6 1.5,1.6 4.2,0.6 5.6,-2.1 2,-3.8 2.6,-9.2 3,-25.3 0.2,-10.6 0.3,-12 0.8,-11.6 0.9,0.7 5.7,10.3 6.6,13.3 2.4,7.5 6.4,18.6 7.8,21.4 1.2,2.4 2.2,3.7 4.2,5.6 2.8,2.8 3.8,3.1 5.4,1.7 z M 244,348.4 c 6.5,-0.8 13.2,-2.6 18.1,-5 2.5,-1.2 9.7,-7 12.1,-9.6 4.5,-5 6.4,-8.4 9,-16.2 2.3,-6.9 2.9,-10.6 2.9,-18.6 0,-10.1 -1.3,-16 -5.5,-24 -5.6,-10.7 -12.6,-18.8 -21.1,-24.3 -5.8,-3.8 -15.2,-8.1 -21.6,-9.9 -4.6,-1.3 -13,-2.8 -17.2,-3 -9.5,-0.6 -19.6,2.3 -26.1,7.5 -3.3,2.6 -7.3,8.9 -9.3,14.7 -1.3,3.7 -1.5,4.5 -1.6,8.7 -0.2,7.6 0.6,20 1.9,28.4 0.6,4.2 1.4,9.6 1.8,12 0.7,5.4 1.3,7.8 3.1,13.2 1.7,5.2 3,7.5 5.8,11 4.6,5.7 10.4,9.4 19.9,12.6 8,2.7 11.6,3.3 19.1,3.1 2.9,-0.1 6.9,-0.4 8.7,-0.6 z M 103.6,335.9 c 9.2,-3.4 14.1,-7.6 18.2,-15.3 4.9,-9.4 7.9,-31 6.1,-43.5 -1.5,-10.3 -5.3,-19.9 -10.5,-26.5 -2.4,-3 -9.3,-9 -12,-10.3 -2.4,-1.2 -7.1,-2.4 -10.5,-2.7 -2.5,-0.3 -8,0.7 -11.6,2 -1.2,0.4 -3.3,1.6 -4.6,2.5 -3.5,2.6 -5.7,5.4 -7.7,9.9 l -1.7,3.9 0.1,29.9 c 0.1,21.8 0.2,30.4 0.6,31.9 0.7,3 4.9,10.9 7,13.1 1.2,1.2 3,2.5 5.6,3.9 4.3,2.3 7.1,2.9 12.7,3 3.3,0.1 3.7,0 8.3,-1.8 z M 64.4,320.2 c -0.1,-0.1 -0.3,0 -0.3,0.2 0,0.3 0.1,0.4 0.3,0.2 0.2,-0.1 0.2,-0.3 0,-0.4 z m -0.6,-14.4 c 0,-0.1 -0.1,-0.2 -0.2,-0.2 -0.1,0 -0.2,0.1 -0.2,0.2 0,0.1 0.1,0.2 0.2,0.2 0.1,0 0.2,-0.1 0.2,-0.2 z"
+ sodipodi:nodetypes="ccccccccssccscccccccsccccccccscccccccccccccccccccccccccccccscsccccccccccssccssccccccscccccscccssccccccsccccccssssscccsccccscccsccccccsccccccccccsccccccccccccccccccccccccccscsccccccccscscccccccccsscccsccsccccccscccccccscsccccscccsccccccccscccccsscccccccccccccccccccccccccccccccsccsssss"/>
</g>
<path
- id="path869"
- class="st4"
- d="m 237,432.3 c -0.2,-0.5 -1.3,-6.3 -2.5,-12.9 -1.2,-6.6 -3,-17 -4.2,-23.2 -2.5,-13.7 -12.2,-67.3 -15,-82.9 -0.7,-3.8 -1.4,-7.1 -1.6,-7.3 -0.2,-0.2 -2.4,-0.8 -4.8,-1.5 -15.3,-3.9 -40.4,-10.8 -42.2,-11.6 -0.9,-0.4 -1.2,-0.9 -1.2,-1.6 0,-0.5 -0.1,-1.2 -0.3,-1.4 -0.5,-0.7 0.2,-1.3 3.2,-2.6 3.8,-1.7 22.1,-8.7 33.5,-13 5,-1.8 9.3,-3.5 9.6,-3.8 0.3,-0.3 0.7,-3.6 1,-9.7 0.3,-5.1 0.9,-15.4 1.3,-22.9 0.4,-7.5 1.3,-21.9 1.9,-32 0.6,-10.1 1.5,-25.7 2.1,-34.8 0.6,-9.1 1.1,-19.1 1.3,-22.4 0.2,-3.3 0.4,-6.3 0.7,-6.7 0.4,-0.8 2.1,-0.9 2.7,-0.2 0.2,0.3 1.3,5.4 2.4,11.5 1.1,6 3.2,17.5 4.6,25.6 1.5,8 3.6,19.8 4.8,26.2 1.2,6.4 2.2,12.4 2.4,13.4 0.2,1 1,4.3 1.9,7.4 3.5,13.1 8.3,31.7 10,39.3 0.3,1.4 0.7,2.7 0.9,2.9 0.2,0.2 2.6,0.7 5.3,1.3 2.7,0.6 9.1,1.8 14.1,2.9 50.2,10.2 46.6,9.4 47.5,10.4 0.4,0.5 0.4,0.7 -0.1,1 -0.5,0.3 -0.5,0.4 -0.1,0.6 0.9,0.3 0.6,1.3 -0.6,1.9 -2.3,1.1 -26.6,8.2 -51.5,14.8 -6.3,1.7 -11.4,3.1 -11.5,3.2 -0.2,0.2 -0.8,6.3 -1.5,14.2 -0.7,8.4 -0.9,10.4 -1.4,15.2 -0.6,5.9 -0.8,7.7 -1.2,12 -0.8,7.8 -3.8,34.1 -4.6,40.7 -0.2,1.6 -0.6,4.4 -0.8,6.2 -0.2,1.8 -0.5,4.4 -0.6,5.9 -0.3,7.3 -1.6,28.5 -1.8,31.3 l -0.3,3.2 -1.3,0.1 c -1.4,0.2 -1.8,0 -2.1,-0.7 z m 54.3,-10.2 c 0,-0.1 -1.4,-7.6 -3.1,-16.7 -1.7,-9.1 -3.6,-19.1 -4.2,-22.4 -0.6,-3.3 -1.1,-6 -1.2,-6 0,0 -3,-0.8 -6.5,-1.7 -9.7,-2.5 -11.3,-3 -11.4,-3.7 -0.1,-0.8 0.1,-0.9 9.5,-4.4 4.1,-1.5 7.5,-2.8 7.5,-2.9 0.1,-0.1 0.9,-11.9 2.1,-33.4 0.6,-10.6 0.8,-12.5 1.4,-12.4 0.4,0.1 0.7,0.8 0.9,1.7 0.2,0.9 1.3,7.1 2.6,13.8 1.9,10.1 6.3,28.8 7,29.4 0.1,0.1 5.5,1.2 12.1,2.5 6.9,1.4 12.1,2.6 12.3,2.9 0.2,0.3 0.1,0.7 -0.3,1 -0.3,0.3 -5.4,1.7 -11.3,3.3 -5.9,1.6 -10.9,3 -11.3,3.2 -0.4,0.2 -0.7,1.3 -0.9,3.3 -0.9,9 -1.3,13.2 -2,19.1 -1,8.1 -1.5,13.7 -1.9,19.3 -0.2,3.3 -0.4,4.3 -0.8,4.3 -0.3,0 -0.5,-0.1 -0.5,-0.2 z m 0.6,-164.3 c -0.1,-0.2 -0.7,-2.1 -1.2,-4.3 -0.6,-2.2 -2.3,-8.9 -3.9,-14.9 -1.6,-6 -3.2,-12.4 -3.6,-14.2 l -0.7,-3.2 -7.5,-1.7 c -9.7,-2.2 -10.5,-2.4 -10.8,-3.1 -0.2,-0.6 0.1,-0.7 8.4,-2.8 2.4,-0.6 5.5,-1.4 6.8,-1.8 l 2.5,-0.7 0.7,-7.1 c 0.4,-3.9 1,-9.7 1.4,-12.7 0.4,-3.1 0.9,-7.8 1.2,-10.5 0.5,-4.6 1,-6.3 1.7,-5.3 0.1,0.2 0.6,2.5 1.1,5 0.4,2.5 1,5.3 1.2,6.1 0.2,0.9 0.7,3.3 1.1,5.3 0.9,5 4.9,18 5.7,18.4 0.7,0.4 10.4,1.5 16.3,1.8 6.8,0.4 8,0.8 6,1.8 -1.1,0.6 -14.9,4.9 -18.4,5.8 -1.6,0.4 -3,0.8 -3.2,1 -0.2,0.1 -1,6.2 -1.8,13.4 -1.4,11.7 -1.7,16.5 -1.8,22.5 -0.2,1.4 -0.6,2 -1.2,1.2 z" />
+ id="path869"
+ class="st4"
+ d="m 237,432.3 c -0.2,-0.5 -1.3,-6.3 -2.5,-12.9 -1.2,-6.6 -3,-17 -4.2,-23.2 -2.5,-13.7 -12.2,-67.3 -15,-82.9 -0.7,-3.8 -1.4,-7.1 -1.6,-7.3 -0.2,-0.2 -2.4,-0.8 -4.8,-1.5 -15.3,-3.9 -40.4,-10.8 -42.2,-11.6 -0.9,-0.4 -1.2,-0.9 -1.2,-1.6 0,-0.5 -0.1,-1.2 -0.3,-1.4 -0.5,-0.7 0.2,-1.3 3.2,-2.6 3.8,-1.7 22.1,-8.7 33.5,-13 5,-1.8 9.3,-3.5 9.6,-3.8 0.3,-0.3 0.7,-3.6 1,-9.7 0.3,-5.1 0.9,-15.4 1.3,-22.9 0.4,-7.5 1.3,-21.9 1.9,-32 0.6,-10.1 1.5,-25.7 2.1,-34.8 0.6,-9.1 1.1,-19.1 1.3,-22.4 0.2,-3.3 0.4,-6.3 0.7,-6.7 0.4,-0.8 2.1,-0.9 2.7,-0.2 0.2,0.3 1.3,5.4 2.4,11.5 1.1,6 3.2,17.5 4.6,25.6 1.5,8 3.6,19.8 4.8,26.2 1.2,6.4 2.2,12.4 2.4,13.4 0.2,1 1,4.3 1.9,7.4 3.5,13.1 8.3,31.7 10,39.3 0.3,1.4 0.7,2.7 0.9,2.9 0.2,0.2 2.6,0.7 5.3,1.3 2.7,0.6 9.1,1.8 14.1,2.9 50.2,10.2 46.6,9.4 47.5,10.4 0.4,0.5 0.4,0.7 -0.1,1 -0.5,0.3 -0.5,0.4 -0.1,0.6 0.9,0.3 0.6,1.3 -0.6,1.9 -2.3,1.1 -26.6,8.2 -51.5,14.8 -6.3,1.7 -11.4,3.1 -11.5,3.2 -0.2,0.2 -0.8,6.3 -1.5,14.2 -0.7,8.4 -0.9,10.4 -1.4,15.2 -0.6,5.9 -0.8,7.7 -1.2,12 -0.8,7.8 -3.8,34.1 -4.6,40.7 -0.2,1.6 -0.6,4.4 -0.8,6.2 -0.2,1.8 -0.5,4.4 -0.6,5.9 -0.3,7.3 -1.6,28.5 -1.8,31.3 l -0.3,3.2 -1.3,0.1 c -1.4,0.2 -1.8,0 -2.1,-0.7 z m 54.3,-10.2 c 0,-0.1 -1.4,-7.6 -3.1,-16.7 -1.7,-9.1 -3.6,-19.1 -4.2,-22.4 -0.6,-3.3 -1.1,-6 -1.2,-6 0,0 -3,-0.8 -6.5,-1.7 -9.7,-2.5 -11.3,-3 -11.4,-3.7 -0.1,-0.8 0.1,-0.9 9.5,-4.4 4.1,-1.5 7.5,-2.8 7.5,-2.9 0.1,-0.1 0.9,-11.9 2.1,-33.4 0.6,-10.6 0.8,-12.5 1.4,-12.4 0.4,0.1 0.7,0.8 0.9,1.7 0.2,0.9 1.3,7.1 2.6,13.8 1.9,10.1 6.3,28.8 7,29.4 0.1,0.1 5.5,1.2 12.1,2.5 6.9,1.4 12.1,2.6 12.3,2.9 0.2,0.3 0.1,0.7 -0.3,1 -0.3,0.3 -5.4,1.7 -11.3,3.3 -5.9,1.6 -10.9,3 -11.3,3.2 -0.4,0.2 -0.7,1.3 -0.9,3.3 -0.9,9 -1.3,13.2 -2,19.1 -1,8.1 -1.5,13.7 -1.9,19.3 -0.2,3.3 -0.4,4.3 -0.8,4.3 -0.3,0 -0.5,-0.1 -0.5,-0.2 z m 0.6,-164.3 c -0.1,-0.2 -0.7,-2.1 -1.2,-4.3 -0.6,-2.2 -2.3,-8.9 -3.9,-14.9 -1.6,-6 -3.2,-12.4 -3.6,-14.2 l -0.7,-3.2 -7.5,-1.7 c -9.7,-2.2 -10.5,-2.4 -10.8,-3.1 -0.2,-0.6 0.1,-0.7 8.4,-2.8 2.4,-0.6 5.5,-1.4 6.8,-1.8 l 2.5,-0.7 0.7,-7.1 c 0.4,-3.9 1,-9.7 1.4,-12.7 0.4,-3.1 0.9,-7.8 1.2,-10.5 0.5,-4.6 1,-6.3 1.7,-5.3 0.1,0.2 0.6,2.5 1.1,5 0.4,2.5 1,5.3 1.2,6.1 0.2,0.9 0.7,3.3 1.1,5.3 0.9,5 4.9,18 5.7,18.4 0.7,0.4 10.4,1.5 16.3,1.8 6.8,0.4 8,0.8 6,1.8 -1.1,0.6 -14.9,4.9 -18.4,5.8 -1.6,0.4 -3,0.8 -3.2,1 -0.2,0.1 -1,6.2 -1.8,13.4 -1.4,11.7 -1.7,16.5 -1.8,22.5 -0.2,1.4 -0.6,2 -1.2,1.2 z"/>
</g><path
- d="M 253.66845,123.74972 C 198.63349,120.53216 154.74971,76.53724 151.6348,21.45756 c 0,-53.935854 82.92209,-167.45136 105.96793,-198.32499 23.04585,30.87363 88.99254,144.203145 88.99254,198.13901 0,53.93587 -43.11804,102.47814 -92.92682,102.47814 z"
- id="path1"
- style="fill:#6c88d6;fill-opacity:1;stroke:#000000;stroke-width:8.67033;stroke-miterlimit:3.6;stroke-dasharray:none;stroke-opacity:1"
- sodipodi:nodetypes="cccsc" /><ellipse
- style="fill:url(#linearGradient3);fill-opacity:1;stroke:none;stroke-width:2.79614;stroke-miterlimit:3.6;stroke-dasharray:none;stroke-opacity:1"
- id="path2"
- transform="matrix(0.99311389,-0.1171529,-0.21069084,0.97755275,0,0)"
- inkscape:transform-center-x="-4.1546157"
- inkscape:transform-center-y="4.0589138"
- ry="43.314041"
- rx="20.813015"
- cy="26.911554"
- cx="209.0495" /><path
- style="fill:#6c88d6;fill-opacity:1;stroke:none;stroke-width:2.64567;stroke-miterlimit:3.6;stroke-dasharray:none;stroke-opacity:1"
- d="M -72.692308,241.33619 0.09190207,150.84771"
- id="path3" /></g></g><style
- type="text/css"
- id="style1">
+ d="M 253.66845,123.74972 C 198.63349,120.53216 154.74971,76.53724 151.6348,21.45756 c 0,-53.935854 82.92209,-167.45136 105.96793,-198.32499 23.04585,30.87363 88.99254,144.203145 88.99254,198.13901 0,53.93587 -43.11804,102.47814 -92.92682,102.47814 z"
+ id="path1"
+ style="fill:#6c88d6;fill-opacity:1;stroke:#000000;stroke-width:8.67033;stroke-miterlimit:3.6;stroke-dasharray:none;stroke-opacity:1"
+ sodipodi:nodetypes="cccsc"/><ellipse
+ style="fill:url(#linearGradient3);fill-opacity:1;stroke:none;stroke-width:2.79614;stroke-miterlimit:3.6;stroke-dasharray:none;stroke-opacity:1"
+ id="path2"
+ transform="matrix(0.99311389,-0.1171529,-0.21069084,0.97755275,0,0)"
+ inkscape:transform-center-x="-4.1546157"
+ inkscape:transform-center-y="4.0589138"
+ ry="43.314041"
+ rx="20.813015"
+ cy="26.911554"
+ cx="209.0495"/><path
+ style="fill:#6c88d6;fill-opacity:1;stroke:none;stroke-width:2.64567;stroke-miterlimit:3.6;stroke-dasharray:none;stroke-opacity:1"
+ d="M -72.692308,241.33619 0.09190207,150.84771"
+ id="path3"/></g></g>
+ <style
+ type="text/css"
+ id="style1">
.st0{display:none;}
.st1{display:none;fill:#A4D6D9;}
.st2{fill:#A4D6D9;}
diff --git a/freemocap/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
index 3610235d..deafc1e4 100644
--- a/freemocap/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
@@ -2,8 +2,8 @@ import logging
from pathlib import Path
from typing import Callable, Union
-import numpy as np
import cv2
+import numpy as np
from freemocap.core_processes.capture_volume_calibration.anipose_camera_calibration import (
freemocap_anipose,
@@ -28,6 +28,7 @@ class AniposeCameraCalibrator:
charuco_square_size: Union[int, float],
calibration_videos_folder_path: Union[str, Path],
progress_callback: Callable[[str], None] = lambda _: None
+
):
self._charuco_board_object = charuco_board_object
self._progress_callback = progress_callback
@@ -43,7 +44,7 @@ class AniposeCameraCalibrator:
self._initialize_anipose_objects()
def _get_video_paths(
- self,
+ self,
):
self._list_of_video_paths = get_video_paths(path_to_video_folder=Path(self._calibration_videos_folder_path))
@@ -82,7 +83,8 @@ class AniposeCameraCalibrator:
logger.info(success_str)
self._progress_callback(success_str)
if pin_camera_0_to_origin:
- self._anipose_camera_group_object = self.pin_camera_zero_to_origin(cam_group=self._anipose_camera_group_object)
+ self._anipose_camera_group_object = self.pin_camera_zero_to_origin(
+ cam_group=self._anipose_camera_group_object)
# save calibration info to files
calibration_toml_filename = create_camera_calibration_file_name(
recording_name=self._calibration_videos_folder_path.parent.stem
@@ -134,23 +136,23 @@ class AniposeCameraCalibrator:
cam_group.set_translations(tvecs_new)
return cam_group
- def align_rotations_to_cam0(self, cam_group:freemocap_anipose.CameraGroup):
+ def align_rotations_to_cam0(self, cam_group: freemocap_anipose.CameraGroup):
rvecs = cam_group.get_rotations()
- #get rotation of cam 0 to world
- R0,_ = cv2.Rodrigues(rvecs[0])
+ # get rotation of cam 0 to world
+ R0, _ = cv2.Rodrigues(rvecs[0])
rvecs_new = np.empty_like(rvecs)
- #rotates each cameras coordinate system into the new world space
- #R0 maps world -> cam0, so R0.T (which is also the inverse) maps cam0 -> world
- #R0 * R0^-1 = identity matrix, so this makes R0 the origin
+ # rotates each cameras coordinate system into the new world space
+ # R0 maps world -> cam0, so R0.T (which is also the inverse) maps cam0 -> world
+ # R0 * R0^-1 = identity matrix, so this makes R0 the origin
# then we map every other camera into the new world space
for i in range(rvecs.shape[0]):
- Ri,_ = cv2.Rodrigues(rvecs[i])
- Ri_new,_ = cv2.Rodrigues(Ri @ R0.T)
+ Ri, _ = cv2.Rodrigues(rvecs[i])
+ Ri_new, _ = cv2.Rodrigues(Ri @ R0.T)
rvecs_new[i] = Ri_new.flatten()
return rvecs_new
-
- def shift_origin_to_cam0(self, cam_group:freemocap_anipose.CameraGroup):
+
+ def shift_origin_to_cam0(self, cam_group: freemocap_anipose.CameraGroup):
# Get original translation and rotation vectors
tvecs = cam_group.get_translations()
rvecs = cam_group.get_rotations()
diff --git a/freemocap/core_processes/capture_volume_calibration/anipose_camera_calibration/freemocap_anipose.py b/freemocap/core_processes/capture_volume_calibration/anipose_camera_calibration/freemocap_anipose.py
index 7909de02..cfe47086 100644
--- a/freemocap/core_processes/capture_volume_calibration/anipose_camera_calibration/freemocap_anipose.py
+++ b/freemocap/core_processes/capture_volume_calibration/anipose_camera_calibration/freemocap_anipose.py
@@ -36,8 +36,8 @@ def triangulate_simple(points, camera_mats):
for i in range(num_cams):
x, y = points[i]
mat = camera_mats[i]
- A[(i * 2) : (i * 2 + 1)] = x * mat[2] - mat[0]
- A[(i * 2 + 1) : (i * 2 + 2)] = y * mat[2] - mat[1]
+ A[(i * 2): (i * 2 + 1)] = x * mat[2] - mat[0]
+ A[(i * 2 + 1): (i * 2 + 2)] = y * mat[2] - mat[1]
u, s, vh = np.linalg.svd(A, full_matrices=True)
p3d = vh[-1]
p3d = p3d[:3] / p3d[3]
@@ -370,14 +370,14 @@ def get_initial_extrinsics(rtvecs, cam_names=None):
class Camera:
def __init__(
- self,
- matrix=np.eye(3),
- dist=np.zeros(5),
- size=None,
- rvec=np.zeros(3),
- tvec=np.zeros(3),
- name=None,
- extra_dist=False,
+ self,
+ matrix=np.eye(3),
+ dist=np.zeros(5),
+ size=None,
+ rvec=np.zeros(3),
+ tvec=np.zeros(3),
+ name=None,
+ extra_dist=False,
):
self.set_camera_matrix(matrix)
self.set_distortions(dist)
@@ -546,14 +546,14 @@ class Camera:
class FisheyeCamera(Camera):
def __init__(
- self,
- matrix=np.eye(3),
- dist=np.zeros(4),
- size=None,
- rvec=np.zeros(3),
- tvec=np.zeros(3),
- name=None,
- extra_dist=False,
+ self,
+ matrix=np.eye(3),
+ dist=np.zeros(4),
+ size=None,
+ rvec=np.zeros(3),
+ tvec=np.zeros(3),
+ name=None,
+ extra_dist=False,
):
self.set_camera_matrix(matrix)
self.set_distortions(dist)
@@ -727,13 +727,13 @@ class CameraGroup:
return out
def triangulate_possible(
- self,
- points,
- undistort=True,
- min_cams=2,
- progress=False,
- threshold=0.5,
- kill_event: multiprocessing.Event = None,
+ 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
@@ -823,7 +823,7 @@ class CameraGroup:
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, kill_event: multiprocessing.Event = None
+ 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"""
@@ -883,18 +883,18 @@ class CameraGroup:
return errors
def bundle_adjust_iter(
- self,
- p2ds,
- extra=None,
- n_iters=10,
- start_mu=15,
- end_mu=1,
- max_nfev=200,
- ftol=1e-4,
- n_samp_iter=100,
- n_samp_full=1000,
- error_threshold=0.3,
- verbose=False,
+ self,
+ p2ds,
+ extra=None,
+ n_iters=10,
+ start_mu=15,
+ end_mu=1,
+ max_nfev=200,
+ ftol=1e-4,
+ n_samp_iter=100,
+ n_samp_full=1000,
+ error_threshold=0.3,
+ verbose=False,
):
"""Given an CxNx2 array of 2D points,
where N is the number of points and C is the number of cameras,
@@ -1005,16 +1005,16 @@ class CameraGroup:
return error
def bundle_adjust(
- self,
- p2ds,
- extra=None,
- loss="linear",
- threshold=50,
- ftol=1e-4,
- max_nfev=1000,
- weights=None,
- start_params=None,
- verbose=True,
+ self,
+ p2ds,
+ extra=None,
+ loss="linear",
+ threshold=50,
+ ftol=1e-4,
+ max_nfev=1000,
+ weights=None,
+ start_params=None,
+ verbose=True,
):
"""Given an CxNx2 array of 2D points,
where N is the number of points and C is the number of cameras,
@@ -1079,7 +1079,7 @@ class CameraGroup:
n_cams = len(self.cameras)
sub = n_cam_params * n_cams
n3d = p2ds.shape[1] * 3
- p3ds_test = params[sub : sub + n3d].reshape(-1, 3)
+ p3ds_test = params[sub: sub + n3d].reshape(-1, 3)
errors = self.reprojection_error(p3ds_test, p2ds)
errors_reproj = errors[good]
@@ -1089,8 +1089,8 @@ class CameraGroup:
min_scale = np.min(objp[objp > 0])
n_boards = int(np.max(ids)) + 1
a = sub + n3d
- rvecs = params[a : a + n_boards * 3].reshape(-1, 3)
- tvecs = params[a + n_boards * 3 : a + n_boards * 6].reshape(-1, 3)
+ rvecs = params[a: a + n_boards * 3].reshape(-1, 3)
+ tvecs = params[a + n_boards * 3: a + n_boards * 6].reshape(-1, 3)
expected = transform_points(objp, rvecs[ids], tvecs[ids])
errors_obj = 2 * (p3ds_test - expected).ravel() / min_scale
else:
@@ -1223,29 +1223,29 @@ class CameraGroup:
x0 = np.zeros(total_cam_params + p3ds.size + total_board_params)
x0[:total_cam_params] = cam_params
- x0[total_cam_params : total_cam_params + p3ds.size] = p3ds.ravel()
+ x0[total_cam_params: total_cam_params + p3ds.size] = p3ds.ravel()
if extra is not None:
start_board = total_cam_params + p3ds.size
- x0[start_board : start_board + n_boards * 3] = rvecs.ravel()
- x0[start_board + n_boards * 3 : start_board + n_boards * 6] = tvecs.ravel()
+ x0[start_board: start_board + n_boards * 3] = rvecs.ravel()
+ x0[start_board + n_boards * 3: start_board + n_boards * 6] = tvecs.ravel()
return x0, n_cam_params
def optim_points(
- self,
- points,
- p3ds,
- constraints=[],
- constraints_weak=[],
- scale_smooth=4,
- scale_length=2,
- scale_length_weak=0.5,
- reproj_error_threshold=15,
- reproj_loss="soft_l1",
- n_deriv_smooth=1,
- scores=None,
- verbose=False,
+ self,
+ points,
+ p3ds,
+ constraints=[],
+ constraints_weak=[],
+ scale_smooth=4,
+ scale_length=2,
+ scale_length_weak=0.5,
+ reproj_error_threshold=15,
+ reproj_loss="soft_l1",
+ n_deriv_smooth=1,
+ scores=None,
+ verbose=False,
):
"""
Take in an array of 2D points of shape CxNxJx2,
@@ -1319,19 +1319,19 @@ class CameraGroup:
return p3ds_new2
def optim_points_possible(
- self,
- points,
- p3ds,
- constraints=[],
- constraints_weak=[],
- scale_smooth=4,
- scale_length=2,
- scale_length_weak=0.5,
- reproj_error_threshold=15,
- reproj_loss="soft_l1",
- n_deriv_smooth=1,
- scores=None,
- verbose=False,
+ self,
+ points,
+ p3ds,
+ constraints=[],
+ constraints_weak=[],
+ scale_smooth=4,
+ scale_length=2,
+ scale_length_weak=0.5,
+ reproj_error_threshold=15,
+ reproj_loss="soft_l1",
+ n_deriv_smooth=1,
+ scores=None,
+ verbose=False,
):
"""
Take in an array of 2D points of shape CxNxJxPx2,
@@ -1477,18 +1477,18 @@ class CameraGroup:
@jit(forceobj=True, parallel=True)
def _error_fun_triangulation(
- self,
- params,
- p2ds,
- constraints=[],
- constraints_weak=[],
- scores=None,
- scale_smooth=10000,
- scale_length=1,
- scale_length_weak=0.2,
- reproj_error_threshold=100,
- reproj_loss="soft_l1",
- n_deriv_smooth=1,
+ self,
+ params,
+ p2ds,
+ constraints=[],
+ constraints_weak=[],
+ scores=None,
+ scale_smooth=10000,
+ scale_length=1,
+ scale_length_weak=0.2,
+ reproj_error_threshold=100,
+ reproj_loss="soft_l1",
+ n_deriv_smooth=1,
):
n_cams, n_frames, n_joints, _ = p2ds.shape
@@ -1498,8 +1498,8 @@ class CameraGroup:
# load params
p3ds = params[:n_3d].reshape((n_frames, n_joints, 3))
- joint_lengths = np.array(params[n_3d : n_3d + n_constraints])
- joint_lengths_weak = np.array(params[n_3d + n_constraints :])
+ joint_lengths = np.array(params[n_3d: n_3d + n_constraints])
+ joint_lengths_weak = np.array(params[n_3d + n_constraints:])
# reprojection errors
p3ds_flat = p3ds.reshape(-1, 3)
@@ -1794,13 +1794,13 @@ class CameraGroup:
return np.mean(errors)
def calibrate_rows(
- self,
- all_rows,
- board,
- init_intrinsics=True,
- init_extrinsics=True,
- verbose=True,
- **kwargs,
+ self,
+ all_rows,
+ board,
+ init_intrinsics=True,
+ init_extrinsics=True,
+ verbose=True,
+ **kwargs,
):
assert len(all_rows) == len(self.cameras), "Number of camera detections does not match number of cameras"
@@ -1861,13 +1861,13 @@ class CameraGroup:
cam.set_size(size)
def calibrate_videos(
- self,
- videos,
- board,
- init_intrinsics=True,
- init_extrinsics=True,
- verbose=True,
- **kwargs,
+ self,
+ videos,
+ board,
+ init_intrinsics=True,
+ init_extrinsics=True,
+ verbose=True,
+ **kwargs,
):
"""Takes as input a list of list of video filenames, one list of each camera.
Also takes a board which specifies what should be detected in the videos"""
@@ -1942,15 +1942,15 @@ class CameraGroup:
class AniposeCharucoBoard(CharucoBoard):
def __init__(
- self,
- squaresX,
- squaresY,
- square_length,
- marker_length,
- marker_bits=4,
- dict_size=50,
- aruco_dict=None,
- manually_verify=False,
+ self,
+ squaresX,
+ squaresY,
+ square_length,
+ marker_length,
+ marker_bits=4,
+ dict_size=50,
+ aruco_dict=None,
+ manually_verify=False,
):
self.squaresX = squaresX
self.squaresY = squaresY
@@ -1990,7 +1990,7 @@ class AniposeCharucoBoard(CharucoBoard):
total_size = (squaresX - 1) * (squaresY - 1)
objp = np.zeros((total_size, 3), np.float64)
- objp[:, :2] = np.mgrid[0 : (squaresX - 1), 0 : (squaresY - 1)].T.reshape(-1, 2)
+ objp[:, :2] = np.mgrid[0: (squaresX - 1), 0: (squaresY - 1)].T.reshape(-1, 2)
objp *= square_length
self.objPoints = objp
@@ -2048,9 +2048,9 @@ class AniposeCharucoBoard(CharucoBoard):
detectedCorners = detectedIds = np.float64([])
if (
- len(detectedCorners) > 0
- and self.manually_verify
- and not self.manually_verify_board_detection(gray, detectedCorners, detectedIds)
+ len(detectedCorners) > 0
+ and self.manually_verify
+ and not self.manually_verify_board_detection(gray, detectedCorners, detectedIds)
):
detectedCorners = detectedIds = np.float64([])
diff --git a/freemocap/core_processes/capture_volume_calibration/save_3d_data_to_npy.py b/freemocap/core_processes/capture_volume_calibration/save_3d_data_to_npy.py
index c82ffc2f..94476f2e 100644
--- a/freemocap/core_processes/capture_volume_calibration/save_3d_data_to_npy.py
+++ b/freemocap/core_processes/capture_volume_calibration/save_3d_data_to_npy.py
@@ -15,35 +15,35 @@ logger = logging.getLogger(__name__)
def save_3d_data_to_npy(
- data3d_numFrames_numTrackedPoints_XYZ: np.ndarray,
- data3d_numFrames_numTrackedPoints_reprojectionError: np.ndarray,
- data3d_numCams_numFrames_numTrackedPoints_reprojectionError: np.ndarray,
- path_to_folder_where_data_will_be_saved: Union[str, Path],
- processing_level: str,
- file_prefix: str = "",
+ data3d_numFrames_numTrackedPoints_XYZ: np.ndarray,
+ data3d_numFrames_numTrackedPoints_reprojectionError: np.ndarray,
+ data3d_numCams_numFrames_numTrackedPoints_reprojectionError: np.ndarray,
+ path_to_folder_where_data_will_be_saved: Union[str, Path],
+ processing_level: str,
+ file_prefix: str = "",
):
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
if processing_level == "raw":
data_3d_save_path = path_to_folder_where_data_will_be_saved / f"{file_prefix}_{RAW_3D_NPY_FILE_NAME}"
reprojection_error_save_path = (
- path_to_folder_where_data_will_be_saved / f"{file_prefix}_{REPROJECTION_ERROR_NPY_FILE_NAME}"
+ path_to_folder_where_data_will_be_saved / f"{file_prefix}_{REPROJECTION_ERROR_NPY_FILE_NAME}"
)
full_reprojection_error_save_path = (
- path_to_folder_where_data_will_be_saved / f"{file_prefix}_{FULL_REPROJECTION_ERROR_NPY_FILE_NAME}"
+ path_to_folder_where_data_will_be_saved / f"{file_prefix}_{FULL_REPROJECTION_ERROR_NPY_FILE_NAME}"
)
elif processing_level == "reprojection_filtered":
data_3d_save_path = (
- path_to_folder_where_data_will_be_saved
- / f"{REPROJECTION_FILTERED_PREFIX}{file_prefix}_{RAW_3D_NPY_FILE_NAME}"
+ path_to_folder_where_data_will_be_saved
+ / f"{REPROJECTION_FILTERED_PREFIX}{file_prefix}_{RAW_3D_NPY_FILE_NAME}"
)
reprojection_error_save_path = (
- path_to_folder_where_data_will_be_saved
- / f"{REPROJECTION_FILTERED_PREFIX}{file_prefix}_{REPROJECTION_ERROR_NPY_FILE_NAME}"
+ path_to_folder_where_data_will_be_saved
+ / f"{REPROJECTION_FILTERED_PREFIX}{file_prefix}_{REPROJECTION_ERROR_NPY_FILE_NAME}"
)
full_reprojection_error_save_path = (
- path_to_folder_where_data_will_be_saved
- / f"{REPROJECTION_FILTERED_PREFIX}{file_prefix}_{FULL_REPROJECTION_ERROR_NPY_FILE_NAME}"
+ path_to_folder_where_data_will_be_saved
+ / f"{REPROJECTION_FILTERED_PREFIX}{file_prefix}_{FULL_REPROJECTION_ERROR_NPY_FILE_NAME}"
)
else:
logger.exception(f"processing_level: {processing_level} not recognized")
diff --git a/freemocap/core_processes/capture_volume_calibration/triangulate_3d_data.py b/freemocap/core_processes/capture_volume_calibration/triangulate_3d_data.py
index 350d113f..c8ba40ee 100644
--- a/freemocap/core_processes/capture_volume_calibration/triangulate_3d_data.py
+++ b/freemocap/core_processes/capture_volume_calibration/triangulate_3d_data.py
@@ -13,10 +13,10 @@ logger = logging.getLogger(__name__)
def triangulate_3d_data(
- anipose_calibration_object: CameraGroup,
- image_2d_data: np.ndarray,
- use_triangulate_ransac: bool = False,
- kill_event: multiprocessing.Event = None,
+ anipose_calibration_object: CameraGroup,
+ image_2d_data: np.ndarray,
+ use_triangulate_ransac: bool = False,
+ kill_event: multiprocessing.Event = None,
) -> tuple[np.ndarray, np.ndarray, np.ndarray]:
number_of_cameras = image_2d_data.shape[0]
number_of_frames = image_2d_data.shape[1]
diff --git a/freemocap/core_processes/export_data/blender_stuff/export_to_blender/export_to_blender.py b/freemocap/core_processes/export_data/blender_stuff/export_to_blender/export_to_blender.py
index 22d89f01..1866229d 100644
--- a/freemocap/core_processes/export_data/blender_stuff/export_to_blender/export_to_blender.py
+++ b/freemocap/core_processes/export_data/blender_stuff/export_to_blender/export_to_blender.py
@@ -13,10 +13,10 @@ 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],
- method: str = "ajc27_blender_addon",
+ recording_folder_path: Union[str, Path],
+ blender_file_path: Union[str, Path],
+ blender_exe_path: Union[str, Path],
+ method: str = "ajc27_blender_addon",
):
logger.info(
f"Exporting session data to a Blender scene at: {str(blender_file_path)} using Blender executable at {str(blender_exe_path)}"
diff --git a/freemocap/core_processes/post_process_skeleton_data/calculate_center_of_mass.py b/freemocap/core_processes/post_process_skeleton_data/calculate_center_of_mass.py
index bdf8e02a..418cc385 100644
--- a/freemocap/core_processes/post_process_skeleton_data/calculate_center_of_mass.py
+++ b/freemocap/core_processes/post_process_skeleton_data/calculate_center_of_mass.py
@@ -1,5 +1,6 @@
import logging
from typing import Dict, Tuple
+
import numpy as np
from freemocap.data_layer.skeleton_models.segments import SegmentAnthropometry
@@ -9,7 +10,7 @@ logger = logging.getLogger(__name__)
def calculate_all_segments_com(
- segment_positions: Dict[str, Dict[str, np.ndarray]], center_of_mass_definitions: Dict[str, SegmentAnthropometry]
+ segment_positions: Dict[str, Dict[str, np.ndarray]], center_of_mass_definitions: Dict[str, SegmentAnthropometry]
) -> Dict[str, np.ndarray]:
"""
Calculates the center of mass (COM) for each segment based on provided segment positions
@@ -45,9 +46,9 @@ def calculate_all_segments_com(
def calculate_total_body_center_of_mass(
- segment_center_of_mass_data: Dict[str, np.ndarray],
- center_of_mass_definitions: Dict[str, SegmentAnthropometry],
- num_frames: int,
+ segment_center_of_mass_data: Dict[str, np.ndarray],
+ center_of_mass_definitions: Dict[str, SegmentAnthropometry],
+ num_frames: int,
) -> np.ndarray:
"""
Calculates the total body center of mass for each frame based on segment COM positions and anthropometric data.
diff --git a/freemocap/core_processes/post_process_skeleton_data/create_skeleton.py b/freemocap/core_processes/post_process_skeleton_data/create_skeleton.py
index 5e329c9c..1694281b 100644
--- a/freemocap/core_processes/post_process_skeleton_data/create_skeleton.py
+++ b/freemocap/core_processes/post_process_skeleton_data/create_skeleton.py
@@ -1,13 +1,12 @@
from typing import List, Dict, Optional
-
from freemocap.data_layer.skeleton_models.marker_info import MarkerInfo
from freemocap.data_layer.skeleton_models.segments import Segment, SegmentAnthropometry
from freemocap.data_layer.skeleton_models.skeleton import Skeleton
def create_marker_info(
- marker_list: List[str], virtual_markers: Optional[Dict[str, Dict[str, List]]] = None
+ marker_list: List[str], virtual_markers: Optional[Dict[str, Dict[str, List]]] = None
) -> MarkerInfo:
"""
Creates a MarkerInfo instance from a list of actual marker names and optional virtual markers.
@@ -28,12 +27,12 @@ def create_marker_info(
def create_skeleton_model(
- actual_markers: List[str],
- num_tracked_points: int,
- segment_connections: Optional[Dict[str, Segment]] = None,
- virtual_markers: Optional[Dict[str, Dict[str, List]]] = None,
- joint_hierarchy: Optional[Dict[str, List[str]]] = None,
- center_of_mass_info: Optional[Dict[str, SegmentAnthropometry]] = None,
+ actual_markers: List[str],
+ num_tracked_points: int,
+ segment_connections: Optional[Dict[str, Segment]] = None,
+ virtual_markers: Optional[Dict[str, Dict[str, List]]] = None,
+ joint_hierarchy: Optional[Dict[str, List[str]]] = None,
+ center_of_mass_info: Optional[Dict[str, SegmentAnthropometry]] = None,
) -> Skeleton:
"""
Creates a Skeleton model that includes both actual and optionally virtual markers
diff --git a/freemocap/core_processes/post_process_skeleton_data/post_process_skeleton.py b/freemocap/core_processes/post_process_skeleton_data/post_process_skeleton.py
index 2fbc9e93..01cf9c42 100644
--- a/freemocap/core_processes/post_process_skeleton_data/post_process_skeleton.py
+++ b/freemocap/core_processes/post_process_skeleton_data/post_process_skeleton.py
@@ -67,10 +67,10 @@ def adjust_default_settings(filter_sampling_rate, filter_cutoff_frequency, filte
def run_post_processing_worker(
- raw_skel3d_frame_marker_xyz: np.ndarray,
- settings_dictionary: dict,
- landmark_names: list,
- run_butterworth_filter: bool,
+ raw_skel3d_frame_marker_xyz: np.ndarray,
+ settings_dictionary: dict,
+ landmark_names: list,
+ run_butterworth_filter: bool,
) -> np.ndarray:
def handle_thread_finished(results, post_processed_data_handler: PostProcessedDataHandler):
# TODO: skellyforge should handle getting the final task results regardless of what was run
@@ -105,9 +105,9 @@ def run_post_processing_worker(
def post_process_data(
- recording_processing_parameter_model: ProcessingParameterModel,
- raw_skel3d_frame_marker_xyz: np.ndarray,
- queue: multiprocessing.Queue,
+ recording_processing_parameter_model: ProcessingParameterModel,
+ raw_skel3d_frame_marker_xyz: np.ndarray,
+ queue: multiprocessing.Queue,
) -> np.ndarray:
if queue:
handler = DirectQueueHandler(queue)
diff --git a/freemocap/core_processes/post_process_skeleton_data/split_and_save.py b/freemocap/core_processes/post_process_skeleton_data/split_and_save.py
index 1a5e7349..05232810 100644
--- a/freemocap/core_processes/post_process_skeleton_data/split_and_save.py
+++ b/freemocap/core_processes/post_process_skeleton_data/split_and_save.py
@@ -1,9 +1,9 @@
+import logging
from pathlib import Path
from typing import Dict, List
-import logging
+
import numpy as np
import pandas as pd
-
from skellytracker.trackers.base_tracker.model_info import ModelInfo
from freemocap.system.paths_and_filenames.file_and_folder_names import (
@@ -15,7 +15,6 @@ from freemocap.system.paths_and_filenames.file_and_folder_names import (
logger = logging.getLogger(__name__)
-
# TODO: This is dependent on the ordering we currently use for mediapipe, maybe it should live in model_info
category_info = {
"body": BODY_3D_DATAFRAME_CSV_FILE_NAME,
@@ -26,12 +25,13 @@ category_info = {
DEFAULT_CATEGORY_NAME = "body"
+
# TODO: come up with a sensible way of splitting this for different types of trackers
def split_data(
- skeleton_3d_data: np.ndarray,
- model_info: ModelInfo,
+ skeleton_3d_data: np.ndarray,
+ model_info: ModelInfo,
) -> Dict[str, np.ndarray]:
"""
Splits the skeleton data into separate arrays for each data category using the provided model info.
@@ -82,7 +82,7 @@ def create_column_names(model_info: ModelInfo) -> Dict[str, List[str]]:
if hasattr(model_info, tracked_points_name):
category_column_names = []
if hasattr(model_info, landmark_names) and len(getattr(model_info, landmark_names)) == getattr(
- model_info, tracked_points_name
+ model_info, tracked_points_name
):
for name in getattr(model_info, landmark_names):
category_column_names.append(f"{category}_{name}_x")
@@ -102,9 +102,9 @@ def create_column_names(model_info: ModelInfo) -> Dict[str, List[str]]:
tracked_points_name = "num_tracked_points"
category_column_names = []
if (
- hasattr(model_info, landmark_names)
- and hasattr(model_info, tracked_points_name)
- and len(getattr(model_info, landmark_names)) == getattr(model_info, tracked_points_name)
+ hasattr(model_info, landmark_names)
+ and hasattr(model_info, tracked_points_name)
+ and len(getattr(model_info, landmark_names)) == getattr(model_info, tracked_points_name)
):
for name in getattr(model_info, landmark_names):
category_column_names.append(f"{category}_{name}_x")
@@ -122,10 +122,10 @@ def create_column_names(model_info: ModelInfo) -> Dict[str, List[str]]:
def save_split_csv(
- output_data_folder_path: str,
- split_data: Dict[str, np.ndarray],
- column_names: Dict[str, List[str]],
- model_info: ModelInfo,
+ output_data_folder_path: str,
+ split_data: Dict[str, np.ndarray],
+ column_names: Dict[str, List[str]],
+ model_info: ModelInfo,
) -> None:
"""
Saves the split skeleton data to CSV files using column names.
@@ -178,9 +178,9 @@ def save_split_npy(output_data_folder_path: str, split_data: Dict[str, np.ndarra
def split_and_save(
- skeleton_3d_data: np.ndarray,
- model_info: ModelInfo,
- output_data_folder_path: str,
+ skeleton_3d_data: np.ndarray,
+ model_info: ModelInfo,
+ output_data_folder_path: str,
) -> None:
"""
Splits the skeleton data into separate arrays for each data category using the provided model info.
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
index 4cb0b5be..66c55b59 100644
--- a/freemocap/core_processes/process_motion_capture_videos/process_recording_folder.py
+++ b/freemocap/core_processes/process_motion_capture_videos/process_recording_folder.py
@@ -2,7 +2,6 @@ import logging
import multiprocessing
from typing import Optional
-
from freemocap.core_processes.post_process_skeleton_data.post_process_skeleton import post_process_data
from freemocap.core_processes.process_motion_capture_videos.processing_pipeline_functions.anatomical_data_pipeline_functions import (
calculate_anatomical_data,
@@ -10,7 +9,6 @@ from freemocap.core_processes.process_motion_capture_videos.processing_pipeline_
from freemocap.core_processes.process_motion_capture_videos.processing_pipeline_functions.data_saving_pipeline_functions import (
save_data,
)
-
from freemocap.core_processes.process_motion_capture_videos.processing_pipeline_functions.image_tracking_pipeline_functions import (
run_image_tracking_pipeline,
)
@@ -22,8 +20,8 @@ from freemocap.core_processes.process_motion_capture_videos.processing_pipeline_
)
from freemocap.data_layer.data_saver.data_saver import DataSaver
from freemocap.data_layer.recording_models.post_processing_parameter_models import ProcessingParameterModel
-from freemocap.system.logging.queue_logger import DirectQueueHandler
from freemocap.system.logging.configure_logging import log_view_logging_format_string
+from freemocap.system.logging.queue_logger import DirectQueueHandler
from freemocap.utilities.geometry.rotate_by_90_degrees_around_x_axis import rotate_by_90_degrees_around_x_axis
from freemocap.utilities.kill_event_exception import KillEventException
@@ -31,10 +29,10 @@ logger = logging.getLogger(__name__)
def process_recording_folder(
- recording_processing_parameter_model: ProcessingParameterModel,
- kill_event: multiprocessing.Event = None,
- logging_queue: Optional[multiprocessing.Queue] = None,
- use_tqdm: bool = True,
+ recording_processing_parameter_model: ProcessingParameterModel,
+ kill_event: multiprocessing.Event = None,
+ logging_queue: Optional[multiprocessing.Queue] = None,
+ use_tqdm: bool = True,
) -> None:
"""
diff --git a/freemocap/core_processes/process_motion_capture_videos/processing_pipeline_functions/anatomical_data_pipeline_functions.py b/freemocap/core_processes/process_motion_capture_videos/processing_pipeline_functions/anatomical_data_pipeline_functions.py
index 4b9b5547..199adc88 100644
--- a/freemocap/core_processes/process_motion_capture_videos/processing_pipeline_functions/anatomical_data_pipeline_functions.py
+++ b/freemocap/core_processes/process_motion_capture_videos/processing_pipeline_functions/anatomical_data_pipeline_functions.py
@@ -1,8 +1,8 @@
import logging
import multiprocessing
from typing import Dict, Union
-import numpy as np
+import numpy as np
from freemocap.core_processes.post_process_skeleton_data.calculate_center_of_mass import (
calculate_center_of_mass_from_skeleton,
@@ -10,16 +10,16 @@ from freemocap.core_processes.post_process_skeleton_data.calculate_center_of_mas
from freemocap.core_processes.post_process_skeleton_data.create_skeleton import create_skeleton_model
from freemocap.core_processes.post_process_skeleton_data.enforce_rigid_bones import enforce_rigid_bones_from_skeleton
from freemocap.data_layer.recording_models.post_processing_parameter_models import ProcessingParameterModel
-from freemocap.system.logging.queue_logger import DirectQueueHandler
from freemocap.system.logging.configure_logging import log_view_logging_format_string
+from freemocap.system.logging.queue_logger import DirectQueueHandler
logger = logging.getLogger(__name__)
def calculate_anatomical_data(
- processing_parameters: ProcessingParameterModel,
- skel3d_frame_marker_xyz: np.ndarray,
- queue: multiprocessing.Queue,
+ processing_parameters: ProcessingParameterModel,
+ skel3d_frame_marker_xyz: np.ndarray,
+ queue: multiprocessing.Queue,
) -> Dict[str, Union[np.ndarray, None]]:
if queue:
handler = DirectQueueHandler(queue)
diff --git a/freemocap/core_processes/process_motion_capture_videos/processing_pipeline_functions/image_tracking_pipeline_functions.py b/freemocap/core_processes/process_motion_capture_videos/processing_pipeline_functions/image_tracking_pipeline_functions.py
index 4b89769e..5ff0edd4 100644
--- a/freemocap/core_processes/process_motion_capture_videos/processing_pipeline_functions/image_tracking_pipeline_functions.py
+++ b/freemocap/core_processes/process_motion_capture_videos/processing_pipeline_functions/image_tracking_pipeline_functions.py
@@ -14,17 +14,18 @@ from freemocap.data_layer.recording_models.post_processing_parameter_models impo
)
from freemocap.system.logging.configure_logging import log_view_logging_format_string
from freemocap.system.logging.queue_logger import DirectQueueHandler
-from freemocap.system.paths_and_filenames.file_and_folder_names import LOG_VIEW_PROGRESS_BAR_STRING, RAW_DATA_FOLDER_NAME
+from freemocap.system.paths_and_filenames.file_and_folder_names import LOG_VIEW_PROGRESS_BAR_STRING, \
+ RAW_DATA_FOLDER_NAME
from freemocap.tests.test_image_tracking_data_shape import test_image_tracking_data_shape
logger = logging.getLogger(__name__)
def run_image_tracking_pipeline(
- processing_parameters: ProcessingParameterModel,
- kill_event: multiprocessing.Event,
- queue: multiprocessing.Queue,
- use_tqdm: bool,
+ processing_parameters: ProcessingParameterModel,
+ kill_event: multiprocessing.Event,
+ queue: multiprocessing.Queue,
+ use_tqdm: bool,
) -> np.ndarray:
if queue:
handler = DirectQueueHandler(queue)
@@ -53,7 +54,7 @@ def run_image_tracking_pipeline(
processing_parameters.recording_info_model.synchronized_videos_folder_path
),
output_data_folder_path=Path(processing_parameters.recording_info_model.output_data_folder_path)
- / RAW_DATA_FOLDER_NAME,
+ / RAW_DATA_FOLDER_NAME,
kill_event=kill_event,
use_tqdm=use_tqdm,
)
@@ -72,12 +73,12 @@ def run_image_tracking_pipeline(
def run_image_tracking(
- model_info: ModelInfo,
- tracking_params: BaseTrackingParams,
- synchronized_videos_folder_path: Path,
- output_data_folder_path: Path,
- kill_event: multiprocessing.Event = None,
- use_tqdm: bool = True,
+ model_info: ModelInfo,
+ tracking_params: BaseTrackingParams,
+ synchronized_videos_folder_path: Path,
+ output_data_folder_path: Path,
+ kill_event: multiprocessing.Event = None,
+ use_tqdm: bool = True,
):
if hasattr(tracking_params, "use_yolo_crop_method") and tracking_params.use_yolo_crop_method:
model_info.tracker_name = "YOLOMediapipeComboTracker"
diff --git a/freemocap/core_processes/process_motion_capture_videos/processing_pipeline_functions/triangulation_pipeline_functions.py b/freemocap/core_processes/process_motion_capture_videos/processing_pipeline_functions/triangulation_pipeline_functions.py
index d864ac66..3782fe55 100644
--- a/freemocap/core_processes/process_motion_capture_videos/processing_pipeline_functions/triangulation_pipeline_functions.py
+++ b/freemocap/core_processes/process_motion_capture_videos/processing_pipeline_functions/triangulation_pipeline_functions.py
@@ -2,9 +2,12 @@ import logging
import multiprocessing
from pathlib import Path
from typing import Optional
-import numpy as np
+import numpy as np
+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.by_camera_reprojection_filtering import (
run_reprojection_error_filtering,
)
@@ -12,25 +15,22 @@ from freemocap.core_processes.capture_volume_calibration.save_3d_data_to_npy imp
save_3d_data_to_npy,
)
from freemocap.core_processes.capture_volume_calibration.triangulate_3d_data import triangulate_3d_data
-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.post_process_skeleton_data.process_single_camera_skeleton_data import (
process_single_camera_skeleton_data,
)
from freemocap.data_layer.recording_models.post_processing_parameter_models import ProcessingParameterModel
-from freemocap.system.logging.queue_logger import DirectQueueHandler
from freemocap.system.logging.configure_logging import log_view_logging_format_string
+from freemocap.system.logging.queue_logger import DirectQueueHandler
from freemocap.system.paths_and_filenames.file_and_folder_names import LOG_VIEW_PROGRESS_BAR_STRING
logger = logging.getLogger(__name__)
def get_triangulated_data(
- image_data_numCams_numFrames_numTrackedPts_XYZ: np.ndarray,
- processing_parameters: ProcessingParameterModel,
- kill_event: Optional[multiprocessing.Event] = None,
- queue: Optional[multiprocessing.Queue] = None,
+ image_data_numCams_numFrames_numTrackedPts_XYZ: np.ndarray,
+ processing_parameters: ProcessingParameterModel,
+ kill_event: Optional[multiprocessing.Event] = None,
+ queue: Optional[multiprocessing.Queue] = None,
) -> np.ndarray:
if queue:
handler = DirectQueueHandler(queue)
diff --git a/freemocap/data_layer/recording_models/recording_info_model.py b/freemocap/data_layer/recording_models/recording_info_model.py
index 5c34650b..fcca3917 100644
--- a/freemocap/data_layer/recording_models/recording_info_model.py
+++ b/freemocap/data_layer/recording_models/recording_info_model.py
@@ -41,11 +41,11 @@ logger = logging.getLogger(__name__)
class RecordingInfoModel:
def __init__(self, recording_folder_path: Union[Path, str], active_tracker: str = "mediapipe"):
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,
- ]
+ [
+ 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
@@ -133,10 +133,10 @@ class RecordingInfoModel:
@property
def raw_data_3d_npy_file_path(self):
raw_data_path = (
- Path(self._path)
- / OUTPUT_DATA_FOLDER_NAME
- / RAW_DATA_FOLDER_NAME
- / (self.file_prefix + RAW_3D_NPY_FILE_NAME)
+ Path(self._path)
+ / OUTPUT_DATA_FOLDER_NAME
+ / RAW_DATA_FOLDER_NAME
+ / (self.file_prefix + RAW_3D_NPY_FILE_NAME)
)
old_raw_data_path = Path(self._path) / OUTPUT_DATA_FOLDER_NAME / RAW_DATA_FOLDER_NAME / OLD_RAW_3D_NPY_FILE_NAME
if self.active_tracker == "mediapipe" and old_raw_data_path.exists() and not raw_data_path.exists():
@@ -147,18 +147,18 @@ class RecordingInfoModel:
@property
def reprojection_error_data_npy_file_path(self):
reprojection_error_path = (
- Path(self._path)
- / OUTPUT_DATA_FOLDER_NAME
- / RAW_DATA_FOLDER_NAME
- / (self.file_prefix + REPROJECTION_ERROR_NPY_FILE_NAME)
+ Path(self._path)
+ / OUTPUT_DATA_FOLDER_NAME
+ / RAW_DATA_FOLDER_NAME
+ / (self.file_prefix + REPROJECTION_ERROR_NPY_FILE_NAME)
)
raw_reprojection_error_path = (
- Path(self._path) / OUTPUT_DATA_FOLDER_NAME / RAW_DATA_FOLDER_NAME / OLD_REPROJECTION_ERROR_NPY_FILE_NAME
+ Path(self._path) / OUTPUT_DATA_FOLDER_NAME / RAW_DATA_FOLDER_NAME / OLD_REPROJECTION_ERROR_NPY_FILE_NAME
)
if (
- self.active_tracker == "mediapipe"
- and raw_reprojection_error_path.exists()
- and not reprojection_error_path.exists()
+ self.active_tracker == "mediapipe"
+ and raw_reprojection_error_path.exists()
+ and not reprojection_error_path.exists()
):
return str(raw_reprojection_error_path)
else:
@@ -167,16 +167,16 @@ class RecordingInfoModel:
@property
def total_body_center_of_mass_npy_file_path(self):
total_body_com_path = (
- Path(self._path)
- / OUTPUT_DATA_FOLDER_NAME
- / CENTER_OF_MASS_FOLDER_NAME
- / (self.file_prefix + TOTAL_BODY_CENTER_OF_MASS_NPY_FILE_NAME)
+ Path(self._path)
+ / OUTPUT_DATA_FOLDER_NAME
+ / CENTER_OF_MASS_FOLDER_NAME
+ / (self.file_prefix + TOTAL_BODY_CENTER_OF_MASS_NPY_FILE_NAME)
)
raw_total_body_com_path = (
- Path(self._path)
- / OUTPUT_DATA_FOLDER_NAME
- / CENTER_OF_MASS_FOLDER_NAME
- / OLD_TOTAL_BODY_CENTER_OF_MASS_NPY_FILE_NAME
+ Path(self._path)
+ / OUTPUT_DATA_FOLDER_NAME
+ / CENTER_OF_MASS_FOLDER_NAME
+ / OLD_TOTAL_BODY_CENTER_OF_MASS_NPY_FILE_NAME
)
if self.active_tracker == "mediapipe" and raw_total_body_com_path.exists() and not total_body_com_path.exists():
return str(raw_total_body_com_path)
diff --git a/freemocap/data_layer/skeleton_models/segments.py b/freemocap/data_layer/skeleton_models/segments.py
index add6f6cd..8b1f42f6 100644
--- a/freemocap/data_layer/skeleton_models/segments.py
+++ b/freemocap/data_layer/skeleton_models/segments.py
@@ -1,4 +1,5 @@
from typing import Dict
+
from pydantic import BaseModel, model_validator
from freemocap.data_layer.skeleton_models.marker_info import MarkerInfo
diff --git a/freemocap/gui/qt/actions_and_menus/actions.py b/freemocap/gui/qt/actions_and_menus/actions.py
index 79083adc..2b68e0e0 100644
--- a/freemocap/gui/qt/actions_and_menus/actions.py
+++ b/freemocap/gui/qt/actions_and_menus/actions.py
@@ -28,9 +28,13 @@ DONATE_ACTION_NAME = "Donate to Freemocap"
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 = 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.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
@@ -40,32 +44,58 @@ class Actions:
freemocap_main_window.handle_load_most_recent_recording
)
- self.load_existing_recording_action = QAction(LOAD_RECORDING_ACTION_NAME, parent=freemocap_main_window)
+ self.load_existing_recording_action = QAction(
+ LOAD_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.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 = 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.import_videos_action.triggered.connect(
+ freemocap_main_window.open_import_videos_dialog
+ )
- self.download_sample_data_action = QAction(DOWNLOAD_SAMPLE_DATA_ACTION_NAME, parent=freemocap_main_window)
+ self.download_sample_data_action = QAction(
+ DOWNLOAD_SAMPLE_DATA_ACTION_NAME, parent=freemocap_main_window
+ )
self.download_sample_data_action.triggered.connect(
- lambda: freemocap_main_window.download_data(download_url=FIGSHARE_SAMPLE_ZIP_FILE_URL)
+ lambda: freemocap_main_window.download_data(
+ download_url=FIGSHARE_SAMPLE_ZIP_FILE_URL
+ )
)
- self.download_test_data_action = QAction(DOWNLOAD_TEST_DATA_ACTION_NAME, parent=freemocap_main_window)
+ self.download_test_data_action = QAction(
+ DOWNLOAD_TEST_DATA_ACTION_NAME, parent=freemocap_main_window
+ )
self.download_test_data_action.triggered.connect(
- lambda: freemocap_main_window.download_data(download_url=FIGSHARE_TEST_ZIP_FILE_URL)
+ lambda: freemocap_main_window.download_data(
+ download_url=FIGSHARE_TEST_ZIP_FILE_URL
+ )
)
- self.set_data_folder_action = QAction(SET_DATA_FOLDER_ACTION_NAME, parent=freemocap_main_window)
+ self.set_data_folder_action = QAction(
+ SET_DATA_FOLDER_ACTION_NAME, parent=freemocap_main_window
+ )
self.set_data_folder_action.setShortcut("Ctrl+S")
- self.set_data_folder_action.triggered.connect(freemocap_main_window.open_settings_dialog)
+ self.set_data_folder_action.triggered.connect(
+ freemocap_main_window.open_settings_dialog
+ )
- self.reset_to_defaults_action = QAction(RESET_TO_DEFAULTS_ACTION_NAME, parent=freemocap_main_window)
- self.reset_to_defaults_action.triggered.connect(freemocap_main_window.reset_to_default_gui_settings)
+ self.reset_to_defaults_action = QAction(
+ RESET_TO_DEFAULTS_ACTION_NAME, parent=freemocap_main_window
+ )
+ self.reset_to_defaults_action.triggered.connect(
+ freemocap_main_window.reset_to_default_gui_settings
+ )
- self.reboot_gui_action = QAction(REBOOT_GUI_ACTION_NAME, parent=freemocap_main_window)
+ 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)
@@ -82,14 +112,27 @@ class Actions:
self.exit_action.triggered.connect(freemocap_main_window.close)
# Help
- self.open_docs_action = QAction(OPEN_DOCS_ACTION_NAME, parent=freemocap_main_window)
+ self.open_docs_action = QAction(
+ OPEN_DOCS_ACTION_NAME, parent=freemocap_main_window
+ )
self.open_docs_action.triggered.connect(
lambda: QDesktopServices.openUrl(QUrl(DOCUMENTATION_WELCOME_URL))
)
- self.freemocap_foundation_action = QAction(FREEMOCAP_FOUNDATION_ACTION_NAME, parent=freemocap_main_window)
+ self.freemocap_foundation_action = QAction(
+ FREEMOCAP_FOUNDATION_ACTION_NAME, parent=freemocap_main_window
+ )
self.freemocap_foundation_action.triggered.connect(
- lambda: QDesktopServices.openUrl(QUrl("https://freemocap.org/about-us.html"))
+ lambda: QDesktopServices.openUrl(
+ QUrl("https://freemocap.org/about-us.html")
+ )
+ )
+
+ self.show_release_notes_action = QAction(
+ "Release Notes", parent=freemocap_main_window
+ )
+ self.show_release_notes_action.triggered.connect(
+ freemocap_main_window.open_release_notes_popup
)
# # Navigation
@@ -107,7 +150,9 @@ class Actions:
# Support
self.donate_action = QAction(DONATE_ACTION_NAME, parent=freemocap_main_window)
self.donate_action.triggered.connect(
- lambda: QDesktopServices.openUrl(QUrl("https://freemocap.org/about-us.html#donate"))
+ lambda: QDesktopServices.openUrl(
+ QUrl("https://freemocap.org/about-us.html#donate")
+ )
)
# self.send_usage_statistics_action = QAction("Send &User Statistics", parent=freemocap_main_window)
# self.user_survey_action = QAction("&User Survey", parent=freemocap_main_window)
diff --git a/freemocap/gui/qt/actions_and_menus/menu_bar.py b/freemocap/gui/qt/actions_and_menus/menu_bar.py
index dd84fd59..54516e16 100644
--- a/freemocap/gui/qt/actions_and_menus/menu_bar.py
+++ b/freemocap/gui/qt/actions_and_menus/menu_bar.py
@@ -47,7 +47,7 @@ class MenuBar(QMenuBar):
#
# help menu
help_menu = self.addMenu("&Help")
-
+ help_menu.addAction(actions.show_release_notes_action)
help_menu.addAction(actions.open_docs_action)
help_menu.addAction(actions.freemocap_foundation_action)
#
diff --git a/freemocap/gui/qt/freemocap_main.py b/freemocap/gui/qt/freemocap_main.py
index 78f273de..f0840b74 100644
--- a/freemocap/gui/qt/freemocap_main.py
+++ b/freemocap/gui/qt/freemocap_main.py
@@ -6,8 +6,10 @@ from importlib.metadata import distributions
from PySide6.QtCore import QTimer
from PySide6.QtWidgets import QApplication
+from freemocap.gui.qt.utilities.save_and_load_gui_state import save_gui_state
from freemocap.gui.qt.main_window.freemocap_main_window import MainWindow, EXIT_CODE_REBOOT
+from freemocap.gui.qt.widgets.release_notes_dialogs.tabbed_release_notes_types import ReleaseNotesDisplayOption
logging.getLogger("matplotlib").setLevel(logging.WARNING)
@@ -43,13 +45,7 @@ def qt_gui_main():
freemocap_main_window.show()
- if freemocap_main_window._gui_state.show_welcome_screen:
- freemocap_main_window.open_welcome_screen_dialog()
- if freemocap_main_window._gui_state.show_data_quality_warning:
- freemocap_main_window.open_data_quality_warning_dialog()
- installed_packages = {dist.metadata["Name"] for dist in distributions()}
- if "opencv-python" in installed_packages and "opencv-contrib-python" in installed_packages:
- freemocap_main_window.open_opencv_conflict_dialog()
+ handle_pop_ups(freemocap_main_window)
timer.timeout.connect(freemocap_main_window.update)
error_code = app.exec()
@@ -65,5 +61,21 @@ def qt_gui_main():
sys.exit()
+def handle_pop_ups(freemocap_main_window):
+
+ if freemocap_main_window._gui_state.show_welcome_screen:
+ freemocap_main_window.open_welcome_screen_dialog()
+ if not freemocap_main_window._gui_state.shown_latest_release_notes:
+ freemocap_main_window.open_release_notes_popup()
+
+
+ f = 2
+
+
+ installed_packages = {dist.metadata["Name"] for dist in distributions()}
+ if "opencv-python" in installed_packages and "opencv-contrib-python" in installed_packages:
+ freemocap_main_window.open_opencv_conflict_dialog()
+
+
if __name__ == "__main__":
qt_gui_main()
diff --git a/freemocap/gui/qt/main_window/freemocap_main_window.py b/freemocap/gui/qt/main_window/freemocap_main_window.py
index df1d60c9..1666a5dd 100644
--- a/freemocap/gui/qt/main_window/freemocap_main_window.py
+++ b/freemocap/gui/qt/main_window/freemocap_main_window.py
@@ -1,6 +1,7 @@
import logging
import multiprocessing
import shutil
+import threading
from pathlib import Path
from typing import Union, List, Callable
@@ -21,7 +22,6 @@ from skellycam import (
)
from tqdm import tqdm
-
from freemocap.data_layer.generate_jupyter_notebook.generate_jupyter_notebook import (
generate_jupyter_notebook,
)
@@ -47,7 +47,6 @@ 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.butterworth_warning_dialog import Version_1_5_4_DataWarningDialog
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 (
@@ -64,11 +63,11 @@ from freemocap.gui.qt.widgets.home_widget import (
from freemocap.gui.qt.widgets.import_videos_wizard import ImportVideosWizard
from freemocap.gui.qt.widgets.log_view_widget import LogViewWidget
from freemocap.gui.qt.widgets.opencv_conflict_dialog import OpencvConflictDialog
+from freemocap.gui.qt.widgets.release_notes_dialogs.tabbed_release_notes_dialog import TabbedReleaseNotesDialog
from freemocap.gui.qt.widgets.set_data_folder_dialog import SetDataFolderDialog
from freemocap.gui.qt.widgets.welcome_screen_dialog import WelcomeScreenDialog
from freemocap.gui.qt.workers.download_sample_data_thread_worker import DownloadDataThreadWorker
from freemocap.gui.qt.workers.export_to_blender_thread_worker import ExportToBlenderThreadWorker
-
# reboot GUI method based on this - https://stackoverflow.com/a/56563926/14662833
from freemocap.system.open_file import open_file
from freemocap.system.paths_and_filenames.file_and_folder_names import (
@@ -92,10 +91,10 @@ logger = logging.getLogger(__name__)
class MainWindow(QMainWindow):
def __init__(
- self,
- freemocap_data_folder_path: Union[str, Path],
- pipedream_pings: PipedreamPings,
- parent=None,
+ self,
+ freemocap_data_folder_path: Union[str, Path],
+ pipedream_pings: PipedreamPings,
+ parent=None,
):
super().__init__(parent=parent)
self._log_view_widget = LogViewWidget(parent=self) # start this first so it will grab the setup logs
@@ -115,7 +114,7 @@ class MainWindow(QMainWindow):
self._freemocap_data_folder_path = freemocap_data_folder_path
self._pipedream_pings = pipedream_pings
- self._gui_state = load_gui_state(get_gui_state_json_path())
+ self._gui_state: GuiState = load_gui_state(get_gui_state_json_path())
self._kill_thread_event = multiprocessing.Event()
@@ -169,8 +168,8 @@ class MainWindow(QMainWindow):
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
+ 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()
@@ -356,7 +355,7 @@ class MainWindow(QMainWindow):
try:
self._process_motion_capture_data_panel.update_calibration_path()
except (
- AttributeError
+ AttributeError
): # Active Recording and Data Panel widgets rely on each other, so we're guaranteed to hit this every time the app opens
logger.debug("Process motion capture data panel not created yet, skipping claibraiton setting")
except Exception as e:
@@ -436,7 +435,7 @@ class MainWindow(QMainWindow):
self._visualization_control_panel._blender_executable_label.setText(str(self._gui_state.blender_path))
self._visualization_control_panel._blender_executable_path = str(self._gui_state.blender_path)
- save_gui_state(self._gui_state, get_gui_state_json_path())
+ save_gui_state(self._gui_state)
self._active_recording_info_widget.set_active_recording(recording_folder_path=get_most_recent_recording_path())
@@ -471,14 +470,19 @@ class MainWindow(QMainWindow):
self._welcome_screen_dialog.exec()
- def open_data_quality_warning_dialog(self):
- logger.info("Opening `Data Quality Warning` dialog... ")
+ def open_release_notes_popup(self):
+ logger.info("Opening `Release Notes` dialog... ")
- data_quality_warning_dialog = Version_1_5_4_DataWarningDialog(
- gui_state=self._gui_state, kill_thread_event=self._kill_thread_event, parent=self
- )
+ self._gui_state.shown_latest_release_notes = True
+
+ save_gui_state(gui_state=self._gui_state, file_pathstring=get_gui_state_json_path())
- data_quality_warning_dialog.exec()
+ dialog = TabbedReleaseNotesDialog(
+ kill_thread_event=threading.Event(),
+ gui_state=self._gui_state,
+ dark_mode=True # Set to True for dark mode, False for light mode
+ )
+ dialog.exec()
def open_opencv_conflict_dialog(self):
self._opencv_conflict_dialog = OpencvConflictDialog(
@@ -519,12 +523,12 @@ class MainWindow(QMainWindow):
if not synchronization_bool:
for video_path in tqdm(
- video_paths,
- desc="Importing videos...",
- colour=[255, 128, 0],
- unit="video",
- unit_scale=True,
- leave=False,
+ 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!")
diff --git a/freemocap/gui/qt/style_sheet/qt_style_sheet.css b/freemocap/gui/qt/style_sheet/qt_style_sheet.css
index 692fdd4f..06cff5d1 100644
--- a/freemocap/gui/qt/style_sheet/qt_style_sheet.css
+++ b/freemocap/gui/qt/style_sheet/qt_style_sheet.css
@@ -1,189 +1,230 @@
* {
- font-family: "Dosis", sans-serif;
- font-size: 14px;
- color: #333333; }
+ font-family: "Dosis", sans-serif;
+ font-size: 14px;
+ color: #333333;
+}
QObject {
- color: #1d1d1f;
- background-color: #f5f5f7; }
+ color: #1d1d1f;
+ background-color: #f5f5f7;
+}
QGroupBox {
- border: 1px solid #bdbdbd;
- border-radius: 4px;
- margin-top: 10px;
- font-weight: bold;
- background-color: #f5f5f5; }
+ border: 1px solid #bdbdbd;
+ border-radius: 4px;
+ margin-top: 10px;
+ font-weight: bold;
+ background-color: #f5f5f5;
+}
QStatusBar {
- color: #1d1d1f; }
+ color: #1d1d1f;
+}
QMainWindow {
- background-color: #e0e0e0; }
+ background-color: #e0e0e0;
+}
QTabWidget::pane {
- border: 1px solid #f5f5f7;
- background: #eeeeee;
- padding: 5px; }
+ border: 1px solid #f5f5f7;
+ background: #eeeeee;
+ padding: 5px;
+}
QTabWidget::pane::selection {
- border-top: 1px solid #333333; }
+ border-top: 1px solid #333333;
+}
QTabBar::tab {
- border: 1px solid #1d1d1f;
- padding: 5px;
- padding-right: 15px;
- padding-left: 15px;
- color: #1d1d1f;
- border-top-left-radius: 20px;
- border-top-right-radius: 5px;
- background: #f5f5f7;
- margin-bottom: -5px;
- font-weight: bolder;
- font-size: 16px; }
+ border: 1px solid #1d1d1f;
+ padding: 5px;
+ padding-right: 15px;
+ padding-left: 15px;
+ color: #1d1d1f;
+ border-top-left-radius: 20px;
+ border-top-right-radius: 5px;
+ background: #f5f5f7;
+ margin-bottom: -5px;
+ font-weight: bolder;
+ font-size: 16px;
+}
QTabBar::tab:selected,
QTabBar::tab:hover {
- background: #424242;
- color: #f5f5f7;
- border-color: #1d1d1f; }
+ background: #424242;
+ color: #f5f5f7;
+ border-color: #1d1d1f;
+}
QPushButton {
- border-radius: 10px;
- color: #1d1d1f;
- border: 2px solid #67bcc0;
- background-color: #dbeef0;
- color: #1d1d1f;
- padding: 5px; }
+ border-radius: 10px;
+ color: #1d1d1f;
+ border: 2px solid #67bcc0;
+ background-color: #dbeef0;
+ color: #1d1d1f;
+ padding: 5px;
+}
QPushButton:disabled {
- background-color: #eeeeee;
- border: 2px solid #9e9e9e;
- color: #333333; }
+ background-color: #eeeeee;
+ border: 2px solid #9e9e9e;
+ color: #333333;
+}
QPushButton:hover {
- border: 2px solid #1d1d1f;
- background-color: #67bcc0; }
+ border: 2px solid #1d1d1f;
+ background-color: #67bcc0;
+}
QPushButton:pressed {
- background-color: #53d4dc; }
+ background-color: #53d4dc;
+}
QPushButton:pressed {
- background-color: #53d4dc; }
+ background-color: #53d4dc;
+}
QPushButton#start_recording_button {
- font-size: 16px;
- background-color: #ce7076;
- border: 2px solid #333333;
- padding: 10px;
- border-radius: 10px;
- width: 250px; }
+ font-size: 16px;
+ background-color: #ce7076;
+ border: 2px solid #333333;
+ padding: 10px;
+ border-radius: 10px;
+ width: 250px;
+}
QPushButton#start_recording_button:hover {
- border: 2px solid #cb2c34; }
+ border: 2px solid #cb2c34;
+}
QPushButton#start_recording_button:disabled {
- background-color: #8c7474;
- color: #555555; }
+ background-color: #8c7474;
+ color: #555555;
+}
QPushButton#stop_recording_button {
- font-size: 14px;
- background-color: #eeeeee; }
+ font-size: 14px;
+ background-color: #eeeeee;
+}
QPushButton#stop_recording_button:enabled {
- border: 3px solid #d95158;
- background-color: #eeeeee; }
+ border: 3px solid #d95158;
+ background-color: #eeeeee;
+}
QPushButton#stop_recording_button:hover {
- border: 3px solid #1d1d1f;
- background-color: #eeeeee; }
+ border: 3px solid #1d1d1f;
+ background-color: #eeeeee;
+}
QPushButton#stop_recording_button:disabled {
- color: #555555; }
+ color: #555555;
+}
QPushButton#process_motion_capture_button,
QPushButton#export_to_blender_button {
- font-size: 18px;
- background-color: #67bcc0;
- border: 2px solid #333333; }
+ font-size: 18px;
+ background-color: #67bcc0;
+ border: 2px solid #333333;
+}
QPushButton#process_motion_capture_button:hover,
QPushButton#export_to_blender_button:hover {
- border: 2px solid #398588; }
+ border: 2px solid #398588;
+}
QPushButton#continue_unchanged_button {
- background-color: #dbeef0f9;
- border: 2px solid #67bcc0;
- color: #333333; }
+ background-color: #dbeef0f9;
+ border: 2px solid #67bcc0;
+ color: #333333;
+}
QPushButton#continue_unchanged_button:hover {
- border: 2px solid #1d1d1f;
- background-color: #67bcc0; }
+ border: 2px solid #1d1d1f;
+ background-color: #67bcc0;
+}
WelcomeScreenButton {
- border: 2px solid #333333;
- background-color: #67bcc0;
- color: #1d1d1f;
- font-size: 24px;
- border-radius: 20px;
- padding: 10px;
- min-height: auto; }
+ border: 2px solid #333333;
+ background-color: #67bcc0;
+ color: #1d1d1f;
+ font-size: 24px;
+ border-radius: 20px;
+ padding: 10px;
+ min-height: auto;
+}
WelcomeScreenButton:hover {
- border: 2px solid #398588; }
+ border: 2px solid #398588;
+}
WelcomeScreenButton[recommended_next=true] {
- background-color: #d95158;
- color: #f5f5f7; }
+ background-color: #d95158;
+ color: #f5f5f7;
+}
WelcomeScreenButton[recommended_next=true]:hover {
- border: 2px solid #a1232a; }
+ border: 2px solid #a1232a;
+}
QLabel {
- font-size: 14px;
- color: #333333; }
- QTreeView QLabel {
- color: #1d1d1f; }
+ font-size: 14px;
+ color: #333333;
+}
+
+QTreeView QLabel {
+ color: #1d1d1f;
+}
QLabel:disabled {
- color: #e0e0e0; }
+ color: #e0e0e0;
+}
QLineEdit {
- border: 1px solid #333333;
- border-radius: 4px;
- padding: 0 8px;
- color: #333333;
- background-color: #f5f5f7; }
+ border: 1px solid #333333;
+ border-radius: 4px;
+ padding: 0 8px;
+ color: #333333;
+ background-color: #f5f5f7;
+}
QLineEdit:disabled {
- border: 1px solid #bdbdbd;
- color: #333333;
- background-color: #e0e0e0; }
+ border: 1px solid #bdbdbd;
+ color: #333333;
+ background-color: #e0e0e0;
+}
QTreeView {
- background-color: #eeeeee;
- color: #1d1d1f;
- font-family: "Roboto", sans-serif;
- font-size: 12px; }
+ background-color: #eeeeee;
+ color: #1d1d1f;
+ font-family: "Roboto", sans-serif;
+ font-size: 12px;
+}
QTreeView::item:has-children {
- background-color: #e0e0e0;
- color: #1d1d1f;
- border-bottom: 1px solid #bdbdbd; }
+ background-color: #e0e0e0;
+ color: #1d1d1f;
+ border-bottom: 1px solid #bdbdbd;
+}
QTreeView::item:selected,
QTreeView::item:hover {
- background-color: #f6e0f5;
- color: #333333; }
+ background-color: #f6e0f5;
+ color: #333333;
+}
LogViewWidget {
- background-color: #263238;
- color: #f5f5f7;
- font-family: "Roboto", sans-serif;
- font-size: 12px;
- padding: 8px; }
+ background-color: #263238;
+ color: #f5f5f7;
+ font-family: "Roboto", sans-serif;
+ font-size: 12px;
+ padding: 8px;
+}
QDialog {
- background-color: #f5f5f5; }
+ background-color: #f5f5f5;
+}
QListWidget {
- background-color: #f5f5f5; }
+ background-color: #f5f5f5;
+}
diff --git a/freemocap/gui/qt/utilities/save_and_load_gui_state.py b/freemocap/gui/qt/utilities/save_and_load_gui_state.py
index 6c6882a7..c9bfcaa5 100644
--- a/freemocap/gui/qt/utilities/save_and_load_gui_state.py
+++ b/freemocap/gui/qt/utilities/save_and_load_gui_state.py
@@ -1,5 +1,6 @@
import json
from pathlib import Path
+
from pydantic import BaseModel
from freemocap.core_processes.export_data.blender_stuff.get_best_guess_of_blender_path import (
@@ -9,6 +10,7 @@ from freemocap.system.paths_and_filenames.file_and_folder_names import BASE_FREE
class GuiState(BaseModel):
+ first_run: bool = False
send_user_pings: bool = True
show_welcome_screen: bool = True
auto_process_videos_on_save: bool = True
@@ -18,10 +20,14 @@ class GuiState(BaseModel):
annotate_charuco_images: bool = False
freemocap_data_folder_path: str = str(Path(Path.home(), BASE_FREEMOCAP_DATA_FOLDER_NAME))
blender_path: str = str(get_best_guess_of_blender_path())
- show_data_quality_warning: bool = True
+ show_data_quality_warning: bool = False
+ shown_latest_release_notes: bool = False
-def save_gui_state(gui_state: GuiState, file_pathstring: str) -> None:
+def save_gui_state(gui_state: GuiState, file_pathstring: str | None = None) -> None:
+ from freemocap.system.paths_and_filenames.path_getters import get_gui_state_json_path
+ if file_pathstring is None:
+ file_pathstring = get_gui_state_json_path()
with open(file_pathstring, "w") as file:
json.dump(gui_state.model_dump(mode="json"), file, indent=4)
@@ -31,5 +37,5 @@ def load_gui_state(file_pathstring: str) -> GuiState:
with open(file_pathstring, "r") as file:
gui_state = GuiState(**json.load(file))
except OSError:
- gui_state = GuiState()
+ gui_state = GuiState(first_run=True)
return gui_state
diff --git a/freemocap/gui/qt/widgets/active_recording_widget.py b/freemocap/gui/qt/widgets/active_recording_widget.py
index 1d0d48c8..a4cb5228 100644
--- a/freemocap/gui/qt/widgets/active_recording_widget.py
+++ b/freemocap/gui/qt/widgets/active_recording_widget.py
@@ -18,8 +18,8 @@ class ActiveRecordingInfoWidget(QWidget):
new_active_recording_selected_signal = Signal(RecordingInfoModel)
def __init__(
- self,
- parent: Optional[QWidget] = None,
+ self,
+ parent: Optional[QWidget] = None,
):
super().__init__(parent=parent)
self._layout = QVBoxLayout()
@@ -57,8 +57,8 @@ class ActiveRecordingInfoWidget(QWidget):
return Path(self._active_recording_info.path)
def set_active_recording(
- self,
- recording_folder_path: Union[str, Path, None],
+ self,
+ recording_folder_path: Union[str, Path, None],
):
if recording_folder_path is None or recording_folder_path == "None":
logger.info("No recording folder path provided - clearing active recording")
@@ -105,8 +105,8 @@ class ActiveRecordingTreeView(ParameterTree):
super().__init__(parent=parent, showHeader=False)
def setup_parameter_tree(
- self,
- recording_info_model: RecordingInfoModel,
+ self,
+ recording_info_model: RecordingInfoModel,
):
if recording_info_model is None:
logger.debug("No recording info model provided - clearing parameter tree")
diff --git a/freemocap/gui/qt/widgets/butterworth_warning_dialog.py b/freemocap/gui/qt/widgets/butterworth_warning_dialog.py
deleted file mode 100644
index 9f276b48..00000000
--- a/freemocap/gui/qt/widgets/butterworth_warning_dialog.py
+++ /dev/null
@@ -1,168 +0,0 @@
-import threading
-
-from PySide6.QtCore import Qt, QSize
-from PySide6.QtGui import QPixmap
-from PySide6.QtWidgets import (
- QDialog,
- QVBoxLayout,
- QHBoxLayout,
- QLabel,
- QCheckBox,
- QPushButton,
- QSpacerItem,
- QSizePolicy,
-)
-
-from freemocap.gui.qt.utilities.save_and_load_gui_state import GuiState, save_gui_state
-from freemocap.system.paths_and_filenames.file_and_folder_names import PATH_TO_FREEMOCAP_LOGO_SVG
-from freemocap.system.paths_and_filenames.path_getters import get_gui_state_json_path
-
-SKELLY_SWEAT_SVG = PATH_TO_FREEMOCAP_LOGO_SVG.replace("freemocap-logo-black-border.svg", "skelly-sweat.png")
-
-
-class Version_1_5_4_DataWarningDialog(QDialog):
- def __init__(self, gui_state: GuiState, kill_thread_event: threading.Event, parent=None) -> None:
- super().__init__(parent=parent)
- self.gui_state = gui_state
- self.kill_thread_event = kill_thread_event
-
- self.setMinimumSize(700, 400)
- self.setWindowTitle("Data Quality Advisory")
- self.setStyleSheet(
- """
- QDialog {
- background-color: #f8f9fa;
- }
- QLabel {
- color: #212529;
- }
- QCheckBox {
- color: #495057;
- }
- """
- )
-
- main_layout = QVBoxLayout()
- main_layout.setContentsMargins(30, 30, 30, 30)
- main_layout.setSpacing(20)
- self.setLayout(main_layout)
-
- # Header Section
- header_layout = QHBoxLayout()
- header_layout.setSpacing(30)
-
- # Text Content
- text_layout = QVBoxLayout()
- text_layout.setSpacing(15)
- warning_text = """
- <html>
- <style>
- a {{ color: #2980b9; text-decoration: none; font-weight: 500; }}
- .emphasis {{ color: #c0392b; font-weight: bold; }}
- </style>
- <body>
- <p style="font-size: 18px; font-weight: bold; color: #2c3e50; margin-bottom: 15px;">
- Whoops!!
- </p>
- <p style="font-size: 16px; font-weight: semibold; color: #2c3e50; margin-bottom: 15px;">
- Possible data Quality Regression in versions 1.4.7-1.5.3
- </p>
-
- <p>We identified and fixed a bug in <b>v1.4.7-v1.5.3 (10 Oct 2024 - 10 Mar 2025)</b> that caused the pipeline to Butterworth filtering during processing (<a href="https://github.com/freemocap/freemocap/pull/675">Bugfix PR</a>).
- Recordings from these versions may have increased noise/jitter/shakiness in the final keypoint trajectories.
- <br/><br/>
- Based on your application, the difference may or may not be noticeable. It is most likely to affect users who's applications focus on fine grained trajectories of the hands and limbs (especially for scientific analysis)
- <br/><br/>
- <b>We recommend reprocessing any critical data collected during this period with the latest version of FreeMoCap to ensure the highest quality results.</b>
- <br/><br/>
- You may also filter the data in Blender (see <a href="https://www.youtube.com/watch?v=33OhM5xFUlg">this tutorial Flux Renders</a>)
- <br/>
- --
- <br>
- In preparation for the release of FreeMoCap v2.0 (optimistically Summer 2025), we are implementing a <a href="https://github.com/freemocap/freemocap/pull/676"> set of comprehensive quality assurance diagnostics </a>to ensure that the quality of our output is strictly monotonic across future versions.
-
- <p style="font-size: 13px; margin-top: 20px; color: #7f8c8d;">
- Thanks to (<a href="https://discord.com/channels/760487252379041812/760489602917466133/1346487740568440983">@larap for reporting</a>), and to the rest of the freemocap community for their help in developing this project.
- </p>
- </body>
- </html>
- """
-
- content = QLabel(warning_text)
- content.setStyleSheet(
- """
- font-size: 14px;
- line-height: 1.4;
- color: #2c3e50;
- """
- )
- content.setWordWrap(True)
- content.setOpenExternalLinks(True)
-
- text_layout.addWidget(content)
- header_layout.addLayout(text_layout, 1)
-
- # Logo
- logo_label = QLabel()
- logo_label.setFixedSize(QSize(150, 150))
- logo_label.setAlignment(Qt.AlignCenter) # Center the image in the label
-
- pixmap = QPixmap(SKELLY_SWEAT_SVG)
- if not pixmap.isNull():
- # Scale the pixmap to fit within 150x150 while maintaining aspect ratio
- scaled_pixmap = pixmap.scaled(150, 150, Qt.KeepAspectRatio, Qt.SmoothTransformation)
-
- logo_label.setPixmap(scaled_pixmap)
- else:
- print(f"Failed to load image: {SKELLY_SWEAT_SVG}")
-
- header_layout.addWidget(logo_label, 0, Qt.AlignTop)
-
- main_layout.addLayout(header_layout)
-
- # Bottom Controls
- controls_layout = QHBoxLayout()
- controls_layout.setSpacing(20)
-
- self._dont_show_again_checkbox = QCheckBox("Don't show this message again")
- self._dont_show_again_checkbox.setStyleSheet("font-size: 13px;")
- self._dont_show_again_checkbox.stateChanged.connect(self._dont_show_again_checkbox_changed)
-
- done_btn = QPushButton("Ok")
- done_btn.setStyleSheet(
- """
- QPushButton {
- background-color: #3498db;
- color: white;
- border-radius: 5px;
- border: 1px solid #3498db;
- padding: 10px 25px;
- font-weight: bold;
- min-width: 120px;
- }
- QPushButton:hover {
- background-color: #2980b9;
- }
- """
- )
- done_btn.clicked.connect(self.accept)
-
- controls_layout.addWidget(self._dont_show_again_checkbox)
- controls_layout.addItem(QSpacerItem(40, 20, QSizePolicy.Expanding, QSizePolicy.Minimum))
- controls_layout.addWidget(done_btn)
-
- main_layout.addLayout(controls_layout)
-
- def _dont_show_again_checkbox_changed(self) -> None:
- self.gui_state.show_data_quality_warning = not self._dont_show_again_checkbox.isChecked()
- save_gui_state(gui_state=self.gui_state, file_pathstring=get_gui_state_json_path())
-
-
-if __name__ == "__main__":
- import sys
- from PySide6.QtWidgets import QApplication
-
- app = QApplication(sys.argv)
- dialog = Version_1_5_4_DataWarningDialog(gui_state=GuiState(), kill_thread_event=threading.Event())
- dialog.show()
- sys.exit(app.exec())
diff --git a/freemocap/gui/qt/widgets/control_panel/calibration_control_panel.py b/freemocap/gui/qt/widgets/control_panel/calibration_control_panel.py
index eb303d64..a1a6de89 100644
--- a/freemocap/gui/qt/widgets/control_panel/calibration_control_panel.py
+++ b/freemocap/gui/qt/widgets/control_panel/calibration_control_panel.py
@@ -1,7 +1,7 @@
import logging
import os
-from pathlib import Path
import threading
+from pathlib import Path
from typing import Callable, Optional, Union
from PySide6.QtCore import Qt, Slot, QObject
@@ -18,8 +18,8 @@ from PySide6.QtWidgets import (
QHBoxLayout,
QLayout,
)
-from freemocap.data_layer.recording_models.recording_info_model import RecordingInfoModel
+from freemocap.data_layer.recording_models.recording_info_model import RecordingInfoModel
from freemocap.gui.qt.utilities.save_and_load_gui_state import GuiState, save_gui_state
from freemocap.gui.qt.workers.anipose_calibration_thread_worker import (
AniposeCalibrationThreadWorker,
@@ -34,11 +34,11 @@ logger = logging.getLogger(__name__)
class CalibrationControlPanel(QWidget):
def __init__(
- self,
- get_active_recording_info: Callable[..., Union[RecordingInfoModel, Path]],
- kill_thread_event: threading.Event,
- gui_state: GuiState,
- parent: Optional[QObject] = None,
+ self,
+ get_active_recording_info: Callable[..., Union[RecordingInfoModel, Path]],
+ kill_thread_event: threading.Event,
+ gui_state: GuiState,
+ parent: Optional[QObject] = None,
):
super().__init__(parent=parent)
self.gui_state = gui_state
diff --git a/freemocap/gui/qt/widgets/control_panel_dock_widget.py b/freemocap/gui/qt/widgets/control_panel_dock_widget.py
index 9aab3c8e..937625ed 100644
--- a/freemocap/gui/qt/widgets/control_panel_dock_widget.py
+++ b/freemocap/gui/qt/widgets/control_panel_dock_widget.py
@@ -18,12 +18,12 @@ from freemocap.gui.qt.widgets.control_panel.process_mocap_data_panel.process_mot
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,
+ 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)
diff --git a/freemocap/gui/qt/widgets/log_view_widget.py b/freemocap/gui/qt/widgets/log_view_widget.py
index 452a73fe..5e57f633 100644
--- a/freemocap/gui/qt/widgets/log_view_widget.py
+++ b/freemocap/gui/qt/widgets/log_view_widget.py
@@ -170,7 +170,7 @@ class LogViewWidget(QPlainTextEdit):
self._progress_counter += 1
def _replace_last_line(
- self, text: str
+ self, text: str
) -> None: # from https://stackoverflow.com/questions/53381975/display-terminal-output-with-tqdm-in-qplaintextedit
cursor = self.textCursor()
cursor.movePosition(QtGui.QTextCursor.End)
diff --git a/freemocap/gui/qt/widgets/release_notes_dialogs/__init__.py b/freemocap/gui/qt/widgets/release_notes_dialogs/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/freemocap/gui/qt/widgets/release_notes_dialogs/release_notes_content.py b/freemocap/gui/qt/widgets/release_notes_dialogs/release_notes_content.py
new file mode 100644
index 00000000..cb254b49
--- /dev/null
+++ b/freemocap/gui/qt/widgets/release_notes_dialogs/release_notes_content.py
@@ -0,0 +1,128 @@
+from dataclasses import dataclass
+
+from freemocap.system.paths_and_filenames.file_and_folder_names import PATH_TO_FREEMOCAP_LOGO_SVG
+
+SKELLY_SWEAT_PNG = PATH_TO_FREEMOCAP_LOGO_SVG.replace("freemocap-logo-black-border.svg", "skelly-sweat.png")
+SKELLY_HEART_EYES_PNG = PATH_TO_FREEMOCAP_LOGO_SVG.replace("freemocap-logo-black-border.svg", "skelly-heart-eyes.png")
+
+
+@dataclass
+class ReleaseNoteContent:
+ """Data class to hold content for a release note tab."""
+
+ tab_title: str
+ content_title: str
+ content_html: str
+ logo_path: str | None = None
+ tab_order: int = 0 # Lower numbers appear first
+ latest: bool = False
+
+
+def get_v160_release_notes() -> ReleaseNoteContent:
+ """Return the release notes for v1.6.0."""
+
+ return ReleaseNoteContent(
+ latest=True,
+ tab_title="v1.6.0 Release Notes",
+ content_title="FreeMoCap v1.6.0 - Data Scaling improvement!",
+ content_html="""
+ <html>
+ <style>
+ a {{ color: #ccc; text-decoration: none; font-weight: 500; }}
+ .emphasis {{ color: #aaa; font-weight: bold; }}
+ </style>
+ <body>
+ <p>So, remember last time when we said we were going to add a <a href="https://github.com/freemocap/freemocap/pull/676"> set of comprehensive quality assurance diagnostics </a> to ensure monotonically increasing data quality?
+ <br/><br/>
+
+ Well, we did that and immediately discovered a bug in our calibration/reconstruction pipeline that has apparently been causing a ~10-15% scaling offset to our data (i.e. so measured limb segment lengths would be ~85-115% of their real-world lengths)
+ <br/><br/>
+ Good news is that we fixed it, so our data should be more accurately scaled to real-world units! We call that progress 😌
+ <br/><br/>
+ If your application requires empirical accuracy, we recommend reprocessing any critical data with the latest version of FreeMoCap to ensure the highest quality results.
+ <br/>
+ <br>
+ See <a href="https://github.com/freemocap/freemocap/pull/681">Issue #681</a> for a full run down on the code sleuthing and thread pulling that led to this fix.
+ <br>
+ --
+ <br>
+ For additional details about what's new in v1.6.0 - See <a href="https://github.com/freemocap/freemocap/tree/v1.6.0">the official release page </a>
+ <br/><br/>
+ (You can always access these release notes from the <b>Help</b> menu.)
+
+ </body>
+ </html>
+ """,
+ logo_path=SKELLY_HEART_EYES_PNG,
+ tab_order=0,
+ )
+
+
+def get_v154_release_notes() -> ReleaseNoteContent:
+ """Return the release notes for v1.5.4 (Butterworth fix)."""
+
+ return ReleaseNoteContent(
+ tab_title="v1.5.4 Butterworth Filter Fix",
+ content_title="Butterworth Filter Fix in v1.5.4",
+ content_html="""
+ <html>
+ <style>
+ a {{ color: #ccc; text-decoration: none; font-weight: 500; }}
+ .emphasis {{ color: #aaa; font-weight: bold; }}
+ </style>
+ <body>
+ <p style="font-size: 18px; font-weight: bold; color: #f5a; margin-bottom: 15px;">
+ Whoops!!
+ </p>
+ <p style="font-size: 16px; font-weight: semibold; color: #fc8; margin-bottom: 15px;">
+ Possible data Quality Regression in versions 1.4.7-1.5.3
+ </p>
+
+ <p>We identified and fixed a bug in <b>v1.4.7-v1.5.3 (10 Oct 2024 - 10 Mar 2025)</b> that caused the pipeline to Butterworth filtering during processing (<a href="https://github.com/freemocap/freemocap/pull/675">Bugfix PR</a>).
+ Recordings from these versions may have increased noise/jitter/shakiness in the final keypoint trajectories.
+ <br/><br/>
+ Based on your application, the difference may or may not be noticeable. It is most likely to affect users who's applications focus on fine grained trajectories of the hands and limbs (especially for scientific analysis)
+ <br/><br/>
+ <b>We recommend reprocessing any critical data collected during this period with the latest version of FreeMoCap to ensure the highest quality results.</b>
+ <br/><br/>
+ You may also filter the data in Blender (see <a href="https://www.youtube.com/watch?v=33OhM5xFUlg">this tutorial Flux Renders</a>)
+ <br/>
+ --
+ <br>
+ In preparation for the release of FreeMoCap v2.0 (optimistically Summer 2025), we are implementing a <a href="https://github.com/freemocap/freemocap/pull/676"> set of comprehensive quality assurance diagnostics </a>to ensure that the quality of our output is strictly monotonic across future versions.
+
+ <p style="font-size: 13px; margin-top: 20px; color: #7f8c8d;">
+ Thanks to (<a href="https://discord.com/channels/760487252379041812/760489602917466133/1346487740568440983">@larap for reporting</a>), and to the rest of the freemocap community for their help in developing this project.
+ </p>
+ </body>
+ </html>
+ """,
+ logo_path=SKELLY_SWEAT_PNG,
+ tab_order=1,
+ )
+
+
+def get_older_versions_content() -> ReleaseNoteContent:
+ """Return the content for older versions tab."""
+ return ReleaseNoteContent(
+ tab_title="Older Versions",
+ content_title="Previous Versions",
+ content_html="""
+ <p>For information about older versions, please visit our
+ <a href='https://github.com/freemocap/freemocap/releases'>GitHub releases page</a>.</p>
+ """,
+ logo_path=None,
+ tab_order=2,
+ )
+
+
+def get_all_release_notes() -> list[ReleaseNoteContent]:
+ """Return all release notes in the correct order."""
+ release_notes = [
+ get_v160_release_notes(),
+ get_v154_release_notes(),
+ get_older_versions_content(),
+ ]
+
+ # Sort by tab_order
+ return sorted(release_notes, key=lambda x: x.tab_order)
diff --git a/freemocap/gui/qt/widgets/release_notes_dialogs/release_notes_styles.py b/freemocap/gui/qt/widgets/release_notes_dialogs/release_notes_styles.py
new file mode 100644
index 00000000..f6bd7e09
--- /dev/null
+++ b/freemocap/gui/qt/widgets/release_notes_dialogs/release_notes_styles.py
@@ -0,0 +1,213 @@
+"""
+Stylesheet definitions for the release notes dialogs.
+Provides both light and dark mode styles.
+"""
+
+
+class ReleaseNotesStyles:
+ """
+ Provides stylesheets for the release notes dialogs in both light and dark modes.
+ """
+
+ @staticmethod
+ def get_dialog_style(dark_mode: bool = True) -> str:
+ """Return the CSS style for the dialog."""
+ if dark_mode:
+ return """
+ QDialog {
+ background-color: #1e1e1e;
+ }
+ QLabel {
+ color: #e0e0e0;
+ }
+ QRadioButton {
+ color: #c0c0c0;
+ font-size: 13px;
+ spacing: 8px;
+ }
+ QRadioButton::indicator {
+ width: 16px;
+ height: 16px;
+ }
+ """
+ else:
+ return """
+ QDialog {
+ background-color: #f8f9fa;
+ }
+ QLabel {
+ color: #212529;
+ }
+ QRadioButton {
+ color: #495057;
+ font-size: 13px;
+ spacing: 8px;
+ }
+ QRadioButton::indicator {
+ width: 16px;
+ height: 16px;
+ }
+ """
+
+ @staticmethod
+ def get_tab_widget_style(dark_mode: bool = True) -> str:
+ """Return the CSS style for the tab widget."""
+ if dark_mode:
+ return """
+ QTabWidget::pane {
+ border: 1px solid #3a3a3a;
+ border-radius: 5px;
+ background-color: #2d2d2d;
+ }
+ QTabBar::tab {
+ background-color: #383838;
+ border: 1px solid #3a3a3a;
+ border-right: none;
+ border-top-left-radius: 4px;
+ border-bottom-left-radius: 4px;
+ padding: 10px 15px;
+ margin-bottom: 2px;
+ min-height: 25px;
+ min-width: 150px;
+ text-align: left;
+ color: #c0c0c0;
+ }
+ QTabBar::tab:selected {
+ background-color: #2d2d2d;
+ border-right: 1px solid #2d2d2d;
+ color: #ffffff;
+ font-weight: bold;
+ border-top: 3px solid #3498db; /* Blue accent border */
+ border-left: 1px solid #3498db; /* Blue accent border */
+ border-right: 1px solid #3498db; /* Blue accent border */
+ border-bottom: 1px solid #3498db; /* Blue accent border */
+ }
+ QTabBar::tab:hover:!selected {
+ background-color: #454545;
+ }
+ /* This is the key part for horizontal text in vertical tabs */
+ QTabBar::tab:left {
+ margin-right: 2px;
+ }
+ """
+ else:
+ return """
+ QTabWidget::pane {
+ border: 1px solid #d0d0d0;
+ border-radius: 5px;
+ background-color: #ffffff;
+ }
+ QTabBar::tab {
+ background-color: #f0f0f0;
+ border: 1px solid #d0d0d0;
+ border-right: none;
+ border-top-left-radius: 4px;
+ border-bottom-left-radius: 4px;
+ padding: 10px 15px;
+ margin-bottom: 2px;
+ min-height: 25px;
+ min-width: 150px;
+ text-align: left;
+ }
+ QTabBar::tab:selected {
+ background-color: #ffffff;
+ border-right: 1px solid #ffffff;
+ font-weight: bold;
+ border-left: 3px solid #3498db; /* Blue accent border */
+ }
+ QTabBar::tab:hover:!selected {
+ background-color: #e0e0e0;
+ }
+ /* This is the key part for horizontal text in vertical tabs */
+ QTabBar::tab:left {
+ margin-right: 2px;
+ }
+ """
+
+ @staticmethod
+ def get_group_box_style(dark_mode: bool = True) -> str:
+ """Return the CSS style for group boxes."""
+ if dark_mode:
+ return """
+ QGroupBox {
+ font-weight: bold;
+ border: 1px solid #3a3a3a;
+ border-radius: 5px;
+ margin-top: 10px;
+ padding-top: 15px;
+ color: #e0e0e0;
+ }
+ QGroupBox::title {
+ subcontrol-origin: margin;
+ left: 10px;
+ padding: 0 5px;
+ }
+ """
+ else:
+ return """
+ QGroupBox {
+ font-weight: bold;
+ border: 1px solid #d0d0d0;
+ border-radius: 5px;
+ margin-top: 10px;
+ padding-top: 15px;
+ }
+ QGroupBox::title {
+ subcontrol-origin: margin;
+ left: 10px;
+ padding: 0 5px;
+ }
+ """
+
+ @staticmethod
+ def get_button_style(dark_mode: bool = True) -> str:
+ """Return the CSS style for buttons."""
+ if dark_mode:
+ return """
+ QPushButton {
+ background-color: #2980b9;
+ color: white;
+ border-radius: 5px;
+ border: 1px solid #2980b9;
+ padding: 10px 25px;
+ font-weight: bold;
+ min-width: 120px;
+ }
+ QPushButton:hover {
+ background-color: #3498db;
+ }
+ """
+ else:
+ return """
+ QPushButton {
+ background-color: #3498db;
+ color: white;
+ border-radius: 5px;
+ border: 1px solid #3498db;
+ padding: 10px 25px;
+ font-weight: bold;
+ min-width: 120px;
+ }
+ QPushButton:hover {
+ background-color: #2980b9;
+ }
+ """
+
+ @staticmethod
+ def get_html_content_style(dark_mode: bool = True) -> str:
+ """Return the CSS style for HTML content."""
+ if dark_mode:
+ return """
+ <style>
+ body { color: #e0e0e0; }
+ a { color: #5dade2; text-decoration: none; font-weight: 500; }
+ .feature { color: #2ecc71; font-weight: bold; }
+ </style>
+ """
+ else:
+ return """
+ <style>
+ a { color: #2980b9; text-decoration: none; font-weight: 500; }
+ .feature { color: #27ae60; font-weight: bold; }
+ </style>
+ """
diff --git a/freemocap/gui/qt/widgets/release_notes_dialogs/release_notes_widgets.py b/freemocap/gui/qt/widgets/release_notes_dialogs/release_notes_widgets.py
new file mode 100644
index 00000000..e62958d2
--- /dev/null
+++ b/freemocap/gui/qt/widgets/release_notes_dialogs/release_notes_widgets.py
@@ -0,0 +1,302 @@
+import threading
+from typing import Optional
+
+from PySide6.QtCore import Qt, QSize
+from PySide6.QtGui import QPixmap
+from PySide6.QtWidgets import (
+ QDialog,
+ QVBoxLayout,
+ QHBoxLayout,
+ QLabel,
+ QCheckBox,
+ QPushButton,
+ QSpacerItem,
+ QSizePolicy,
+)
+
+from freemocap.gui.qt.utilities.save_and_load_gui_state import GuiState, save_gui_state
+from freemocap.system.paths_and_filenames.file_and_folder_names import PATH_TO_FREEMOCAP_LOGO_SVG
+from freemocap.system.paths_and_filenames.path_getters import get_gui_state_json_path
+
+
+class ReleaseNotesDialog(QDialog):
+ """
+ Base class for displaying release notes, warnings, or other informational dialogs.
+
+ Subclasses should override the methods to customize the content and behavior.
+ """
+
+ def __init__(
+ self,
+ gui_state: GuiState,
+ kill_thread_event: threading.Event,
+ parent=None,
+ min_width: int = 700,
+ min_height: int = 400,
+ ) -> None:
+ super().__init__(parent=parent)
+ self.gui_state = gui_state
+ self.kill_thread_event = kill_thread_event
+
+ self.setMinimumSize(min_width, min_height)
+ self.setWindowTitle(self.get_window_title())
+ self.setStyleSheet(self.get_dialog_style())
+
+ main_layout = QVBoxLayout()
+ main_layout.setContentsMargins(30, 30, 30, 30)
+ main_layout.setSpacing(20)
+ self.setLayout(main_layout)
+
+ # Header Section
+ header_layout = QHBoxLayout()
+ header_layout.setSpacing(30)
+
+ # Text Content
+ text_layout = QVBoxLayout()
+ text_layout.setSpacing(15)
+
+ content = QLabel(self.get_content_html())
+ content.setStyleSheet(
+ """
+ font-size: 14px;
+ line-height: 1.4;
+ color: #2c3e50;
+ """
+ )
+ content.setWordWrap(True)
+ content.setOpenExternalLinks(True)
+
+ text_layout.addWidget(content)
+ header_layout.addLayout(text_layout, 1)
+
+ # Logo
+ logo_path = self.get_logo_path()
+ if logo_path:
+ logo_label = QLabel()
+ logo_label.setFixedSize(QSize(150, 150))
+ logo_label.setAlignment(Qt.AlignCenter)
+
+ pixmap = QPixmap(logo_path)
+ if not pixmap.isNull():
+ scaled_pixmap = pixmap.scaled(150, 150, Qt.KeepAspectRatio, Qt.SmoothTransformation)
+ logo_label.setPixmap(scaled_pixmap)
+ else:
+ print(f"Failed to load image: {logo_path}")
+
+ header_layout.addWidget(logo_label, 0, Qt.AlignTop)
+
+ main_layout.addLayout(header_layout)
+
+ # Bottom Controls
+ controls_layout = QHBoxLayout()
+ controls_layout.setSpacing(20)
+
+ # Only add checkbox if show_again_flag_name is provided
+ show_again_flag_name = self.get_show_again_flag_name()
+ if show_again_flag_name:
+ self._dont_show_again_checkbox = QCheckBox("Don't show this message again")
+ self._dont_show_again_checkbox.setStyleSheet("font-size: 13px;")
+ self._dont_show_again_checkbox.stateChanged.connect(self._dont_show_again_checkbox_changed)
+ controls_layout.addWidget(self._dont_show_again_checkbox)
+
+ controls_layout.addItem(QSpacerItem(40, 20, QSizePolicy.Expanding, QSizePolicy.Minimum))
+
+ done_btn = QPushButton(self.get_button_text())
+ done_btn.setStyleSheet(self.get_button_style())
+ done_btn.clicked.connect(self.accept)
+ controls_layout.addWidget(done_btn)
+
+ main_layout.addLayout(controls_layout)
+
+ def _dont_show_again_checkbox_changed(self) -> None:
+ """Handle the 'don't show again' checkbox state change."""
+ flag_name = self.get_show_again_flag_name()
+ if flag_name and hasattr(self.gui_state, flag_name):
+ setattr(self.gui_state, flag_name, not self._dont_show_again_checkbox.isChecked())
+ save_gui_state(gui_state=self.gui_state, file_pathstring=get_gui_state_json_path())
+
+ def get_window_title(self) -> str:
+ """Return the window title for the dialog."""
+ raise NotImplementedError("Subclasses must implement get_window_title()")
+
+ def get_content_html(self) -> str:
+ """Return the HTML content to display in the dialog."""
+ raise NotImplementedError("Subclasses must implement get_content_html()")
+
+ def get_logo_path(self) -> Optional[str]:
+ """Return the path to the logo image, or None if no logo should be displayed."""
+ raise NotImplementedError("Subclasses must implement get_logo_path()")
+
+ def get_show_again_flag_name(self) -> Optional[str]:
+ """
+ Return the name of the attribute in gui_state to control showing this dialog again.
+
+ Return None if the dialog should always be shown.
+ """
+ return None
+
+ def get_button_text(self) -> str:
+ """Return the text for the confirmation button."""
+ return "Ok"
+
+ def get_dialog_style(self) -> str:
+ """Return the CSS style for the dialog."""
+ return """
+ QDialog {
+ background-color: #f8f9fa;
+ }
+ QLabel {
+ color: #212529;
+ }
+ QCheckBox {
+ color: #495057;
+ }
+ """
+
+ def get_button_style(self) -> str:
+ """Return the CSS style for the confirmation button."""
+ return """
+ QPushButton {
+ background-color: #3498db;
+ color: white;
+ border-radius: 5px;
+ border: 1px solid #3498db;
+ padding: 10px 25px;
+ font-weight: bold;
+ min-width: 120px;
+ }
+ QPushButton:hover {
+ background-color: #2980b9;
+ }
+ """
+
+
+class NewFeatureReleaseNotesDialog(ReleaseNotesDialog):
+ def __init__(self, gui_state: GuiState, kill_thread_event: threading.Event, parent=None) -> None:
+ super().__init__(
+ gui_state=gui_state,
+ kill_thread_event=kill_thread_event,
+ parent=parent,
+ min_width=800, # Custom width
+ min_height=500, # Custom height
+ )
+
+ def get_window_title(self) -> str:
+ return "New Features in FreeMoCap v2.0"
+
+ def get_content_html(self) -> str:
+ return """
+ <html>
+ <style>
+ a { color: #2980b9; text-decoration: none; font-weight: 500; }
+ .feature { color: #27ae60; font-weight: bold; }
+ </style>
+ <body>
+ <p style="font-size: 20px; font-weight: bold; color: #2c3e50; margin-bottom: 15px;">
+ FreeMoCap v2.0 is Here!
+ </p>
+
+ <p>We're excited to announce the release of FreeMoCap v2.0 with several major improvements:</p>
+
+ <ul>
+ <li><span class="feature">Enhanced Tracking Accuracy:</span> Improved algorithms for more precise motion capture</li>
+ <li><span class="feature">Real-time Feedback:</span> Get immediate visual feedback during recording sessions</li>
+ <li><span class="feature">Extended Export Options:</span> New formats including FBX and BVH for better compatibility</li>
+ <li><span class="feature">Streamlined UI:</span> Redesigned interface for improved workflow</li>
+ </ul>
+
+ <p>Check out our <a href="https://github.com/freemocap/freemocap/releases">release notes</a> for full details and our
+ <a href="https://freemocap.org/tutorial">tutorials</a> to get started with the new features.</p>
+
+ <p style="font-size: 13px; margin-top: 20px; color: #7f8c8d;">
+ Thank you to all our contributors and users for your continued support!
+ </p>
+ </body>
+ </html>
+ """
+
+ def get_logo_path(self) -> Optional[str]:
+ return PATH_TO_FREEMOCAP_LOGO_SVG
+
+ def get_show_again_flag_name(self) -> Optional[str]:
+ return "show_v2_release_notes"
+
+ def get_button_text(self) -> str:
+ return "Let's Go!" # Custom button text
+
+
+# Path to the skelly sweat image
+SKELLY_SWEAT_SVG = PATH_TO_FREEMOCAP_LOGO_SVG.replace("freemocap-logo-black-border.svg", "skelly-sweat.png")
+
+
+class ButterworthWarningDialog(ReleaseNotesDialog):
+ """
+ Dialog to warn users about the data quality regression in versions 1.4.7-1.5.3
+ due to a bug in the Butterworth filtering.
+ """
+
+ def __init__(self, gui_state: GuiState, kill_thread_event: threading.Event, parent=None) -> None:
+ super().__init__(
+ gui_state=gui_state,
+ kill_thread_event=kill_thread_event,
+ parent=parent,
+ min_width=700,
+ min_height=400,
+ )
+
+ def get_window_title(self) -> str:
+ return "Data Quality Advisory"
+
+ def get_content_html(self) -> str:
+ return """
+ <html>
+ <style>
+ a { color: #2980b9; text-decoration: none; font-weight: 500; }
+ .emphasis { color: #c0392b; font-weight: bold; }
+ </style>
+ <body>
+ <p style="font-size: 18px; font-weight: bold; color: #2c3e50; margin-bottom: 15px;">
+ Whoops!!
+ </p>
+ <p style="font-size: 16px; font-weight: semibold; color: #2c3e50; margin-bottom: 15px;">
+ Possible data Quality Regression in versions 1.4.7-1.5.3
+ </p>
+
+ <p>We identified and fixed a bug in <b>v1.4.7-v1.5.3 (10 Oct 2024 - 10 Mar 2025)</b> that caused the pipeline to Butterworth filtering during processing (<a href="https://github.com/freemocap/freemocap/pull/675">Bugfix PR</a>).
+ Recordings from these versions may have increased noise/jitter/shakiness in the final keypoint trajectories.
+ <br/><br/>
+ Based on your application, the difference may or may not be noticeable. It is most likely to affect users who's applications focus on fine grained trajectories of the hands and limbs (especially for scientific analysis)
+ <br/><br/>
+ <b>We recommend reprocessing any critical data collected during this period with the latest version of FreeMoCap to ensure the highest quality results.</b>
+ <br/><br/>
+ You may also filter the data in Blender (see <a href="https://www.youtube.com/watch?v=33OhM5xFUlg">this tutorial Flux Renders</a>)
+ <br/>
+ --
+ <br>
+ In preparation for the release of FreeMoCap v2.0 (optimistically Summer 2025), we are implementing a <a href="https://github.com/freemocap/freemocap/pull/676"> set of comprehensive quality assurance diagnostics </a>to ensure that the quality of our output is strictly monotonic across future versions.
+
+ <p style="font-size: 13px; margin-top: 20px; color: #7f8c8d;">
+ Thanks to (<a href="https://discord.com/channels/760487252379041812/760489602917466133/1346487740568440983">@larap for reporting</a>), and to the rest of the freemocap community for their help in developing this project.
+ </p>
+ </body>
+ </html>
+ """
+
+ def get_logo_path(self) -> Optional[str]:
+ return SKELLY_SWEAT_SVG
+
+ def get_show_again_flag_name(self) -> Optional[str]:
+ return "show_data_quality_warning"
+
+ def get_button_text(self) -> str:
+ return "Ok"
+
+
+if __name__ == "__main__":
+ import sys
+ from PySide6.QtWidgets import QApplication
+
+ app = QApplication(sys.argv)
+ dialog = ButterworthWarningDialog(gui_state=GuiState(), kill_thread_event=threading.Event())
+ dialog.show()
+ sys.exit(app.exec())
diff --git a/freemocap/gui/qt/widgets/release_notes_dialogs/tabbed_release_notes_dialog.py b/freemocap/gui/qt/widgets/release_notes_dialogs/tabbed_release_notes_dialog.py
new file mode 100644
index 00000000..254e31bd
--- /dev/null
+++ b/freemocap/gui/qt/widgets/release_notes_dialogs/tabbed_release_notes_dialog.py
@@ -0,0 +1,213 @@
+import threading
+
+from PySide6.QtCore import Qt, QSize
+from PySide6.QtGui import QPixmap
+from PySide6.QtWidgets import (
+ QDialog,
+ QVBoxLayout,
+ QHBoxLayout,
+ QLabel,
+ QPushButton,
+ QTabWidget,
+ QWidget,
+ QRadioButton,
+ QButtonGroup,
+ QGroupBox,
+)
+
+from freemocap.gui.qt.utilities.save_and_load_gui_state import GuiState, ReleaseNotesDisplayOption
+from freemocap.gui.qt.widgets.release_notes_dialogs.release_notes_content import get_all_release_notes
+from freemocap.gui.qt.widgets.release_notes_dialogs.release_notes_styles import ReleaseNotesStyles
+
+
+class TabbedReleaseNotesDialog(QDialog):
+ """
+ A tabbed dialog that displays release notes from current and previous versions,
+ with options to control when the dialog is shown.
+ """
+
+ def __init__(
+ self,
+ kill_thread_event: threading.Event,
+ gui_state: GuiState,
+ parent=None,
+ min_width: int = 900,
+ min_height: int = 550,
+ dark_mode: bool = True,
+ ) -> None:
+ super().__init__(parent=parent)
+ self.kill_thread_event = kill_thread_event
+ self.gui_state = gui_state
+ self.dark_mode = dark_mode
+
+ self.setMinimumSize(min_width, min_height)
+ self.setWindowTitle("FreeMoCap Release Notes")
+ self.setStyleSheet(ReleaseNotesStyles.get_dialog_style(dark_mode=self.dark_mode))
+
+ # Main layout - horizontal to support side tabs
+ main_layout = QHBoxLayout()
+ main_layout.setContentsMargins(20, 20, 20, 20)
+ main_layout.setSpacing(15)
+ self.setLayout(main_layout)
+
+ # Create tab widget with tabs on the left side
+ self.tab_widget = QTabWidget()
+ self.tab_widget.setTabPosition(QTabWidget.South) # Set tabs to the left side
+ self.tab_widget.setStyleSheet(ReleaseNotesStyles.get_tab_widget_style(dark_mode=self.dark_mode))
+
+ self.tab_widget.tabBar().setElideMode(Qt.ElideNone)
+
+ # Add tabs for different release notes
+ self._add_release_notes_tabs()
+
+ main_layout.addWidget(self.tab_widget, 1)
+
+ # Right side panel for options
+ # options_panel = self._create_options_panel()
+ # main_layout.addWidget(options_panel, 0) # Fixed width for options panel
+
+ def _add_release_notes_tabs(self) -> None:
+ """Add tabs for different release notes."""
+ # Get all release notes content
+ release_notes = get_all_release_notes()
+
+ # Add each release note as a tab
+ for release_note in release_notes:
+ tab = QWidget()
+ layout = QVBoxLayout(tab)
+ layout.setContentsMargins(20, 20, 20, 20)
+
+ # Create content widget
+ content_widget = self._create_release_notes_content(
+ title=release_note.content_title, content=release_note.content_html, logo_path=release_note.logo_path
+ )
+ layout.addWidget(content_widget)
+
+ # Add tab
+ self.tab_widget.addTab(tab, release_note.tab_title)
+
+ def _create_release_notes_content(self, title: str, content: str, logo_path: str = None) -> QWidget:
+ """Create a widget with release notes content."""
+ content_widget = QWidget()
+ content_layout = QHBoxLayout(content_widget)
+ content_layout.setContentsMargins(0, 0, 0, 0)
+ content_layout.setSpacing(20)
+
+ # Text content
+ text_widget = QLabel()
+ text_widget.setWordWrap(True)
+ text_widget.setOpenExternalLinks(True)
+ text_widget.setStyleSheet(
+ """
+ font-size: 14px;
+ line-height: 1.4;
+ color: #e0e0e0;
+ """
+ if self.dark_mode
+ else """
+ font-size: 14px;
+ line-height: 1.4;
+ color: #2c3e50;
+ """
+ )
+
+ # Set HTML content
+ html_content = f"""
+ <html>
+ {ReleaseNotesStyles.get_html_content_style(dark_mode=self.dark_mode)}
+ <body>
+ <p style="font-size: 20px; font-weight: bold; color: {'#e0e0e0' if self.dark_mode else '#2c3e50'}; margin-bottom: 15px;">
+ {title}
+ </p>
+ {content}
+ </body>
+ </html>
+ """
+ text_widget.setText(html_content)
+
+ content_layout.addWidget(text_widget, 1)
+
+ # Logo
+ if logo_path:
+ logo_label = QLabel()
+ logo_label.setFixedSize(QSize(200, 200))
+ logo_label.setAlignment(Qt.AlignCenter)
+
+ pixmap = QPixmap(logo_path)
+ if not pixmap.isNull():
+ scaled_pixmap = pixmap.scaled(200, 200, Qt.KeepAspectRatio, Qt.SmoothTransformation)
+ logo_label.setPixmap(scaled_pixmap)
+ else:
+ print(f"Failed to load image: {logo_path}")
+
+ content_layout.addWidget(logo_label, 0, Qt.AlignTop)
+
+ return content_widget
+
+ def _create_options_panel(self) -> QWidget:
+ """Create the options panel for the dialog."""
+ options_panel = QWidget()
+ options_layout = QVBoxLayout(options_panel)
+ options_layout.setContentsMargins(15, 15, 15, 15)
+ options_layout.setSpacing(15)
+
+ # Display options section
+ options_group = QGroupBox("Display Options")
+ options_group.setStyleSheet(ReleaseNotesStyles.get_group_box_style(dark_mode=self.dark_mode))
+
+ group_layout = QVBoxLayout()
+ group_layout.setContentsMargins(15, 15, 15, 15)
+ group_layout.setSpacing(10)
+ options_group.setLayout(group_layout)
+
+ # Radio buttons for display options
+ self.display_option_group = QButtonGroup(self)
+
+ # Create radio buttons
+ self.radio_startup = QRadioButton(ReleaseNotesDisplayOption.SHOW_ON_STARTUP.value)
+ self.radio_new_release = QRadioButton(ReleaseNotesDisplayOption.SHOW_ON_NEW_RELEASE.value)
+ self.radio_never = QRadioButton(ReleaseNotesDisplayOption.NEVER_SHOW.value)
+
+ # Add radio buttons to group and layout
+ self.display_option_group.addButton(self.radio_startup)
+ self.display_option_group.addButton(self.radio_new_release)
+ self.display_option_group.addButton(self.radio_never)
+
+ group_layout.addWidget(self.radio_startup)
+ group_layout.addWidget(self.radio_new_release)
+ group_layout.addWidget(self.radio_never)
+
+ # Help text
+ help_text = QLabel("You can always access release notes from the <b>Help</b> menu.")
+ help_text.setStyleSheet(f"font-size: 12px; color: {'#a0a0a0' if self.dark_mode else '#666666'};")
+ group_layout.addWidget(help_text)
+
+ options_layout.addWidget(options_group)
+ options_layout.addStretch(1) # Push everything up
+
+ # Close button
+ close_btn = QPushButton("Close")
+ close_btn.setStyleSheet(ReleaseNotesStyles.get_button_style(dark_mode=self.dark_mode))
+ close_btn.clicked.connect(self._on_close)
+ options_layout.addWidget(close_btn)
+ return options_panel
+
+ def _on_close(self) -> None:
+ """Handle the close button click."""
+ # Update gui_state and save
+ self.accept()
+
+
+if __name__ == "__main__":
+ import sys
+ from PySide6.QtWidgets import QApplication
+
+ app = QApplication(sys.argv)
+
+ # Show the new tabbed dialog with dark mode enabled
+ dialog = TabbedReleaseNotesDialog(
+ kill_thread_event=threading.Event(), dark_mode=True # Set to True for dark mode, False for light mode
+ )
+ dialog.show()
+
+ sys.exit(app.exec())
diff --git a/freemocap/gui/qt/widgets/release_notes_dialogs/tabbed_release_notes_types.py b/freemocap/gui/qt/widgets/release_notes_dialogs/tabbed_release_notes_types.py
new file mode 100644
index 00000000..ac6264da
--- /dev/null
+++ b/freemocap/gui/qt/widgets/release_notes_dialogs/tabbed_release_notes_types.py
@@ -0,0 +1,9 @@
+from enum import Enum
+
+
+class ReleaseNotesDisplayOption(Enum):
+ """Enum for release notes display options."""
+
+ SHOW_ON_STARTUP = "Show on startup"
+ SHOW_ON_NEW_RELEASE = "Show only for new releases"
+ NEVER_SHOW = "Never show"
diff --git a/freemocap/gui/qt/widgets/set_data_folder_dialog.py b/freemocap/gui/qt/widgets/set_data_folder_dialog.py
index a69e623b..50761747 100644
--- a/freemocap/gui/qt/widgets/set_data_folder_dialog.py
+++ b/freemocap/gui/qt/widgets/set_data_folder_dialog.py
@@ -1,5 +1,5 @@
-from pathlib import Path
import threading
+from pathlib import Path
from PySide6.QtWidgets import QVBoxLayout, QDialog, QPushButton, QLabel, QHBoxLayout, QFileDialog
diff --git a/freemocap/gui/qt/workers/anipose_calibration_thread_worker.py b/freemocap/gui/qt/workers/anipose_calibration_thread_worker.py
index ab97f301..e0ea7ffd 100644
--- a/freemocap/gui/qt/workers/anipose_calibration_thread_worker.py
+++ b/freemocap/gui/qt/workers/anipose_calibration_thread_worker.py
@@ -20,11 +20,11 @@ class AniposeCalibrationThreadWorker(QThread):
in_progress = Signal(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 = None,
+ self,
+ calibration_videos_folder_path: Union[str, Path],
+ charuco_square_size: Union[int, float],
+ kill_thread_event: threading.Event,
+ charuco_board_definition: CharucoBoardDefinition = None,
):
super().__init__()
logger.info(
diff --git a/freemocap/gui/qt/workers/export_to_blender_thread_worker.py b/freemocap/gui/qt/workers/export_to_blender_thread_worker.py
index 92d950bc..e658e699 100644
--- a/freemocap/gui/qt/workers/export_to_blender_thread_worker.py
+++ b/freemocap/gui/qt/workers/export_to_blender_thread_worker.py
@@ -14,11 +14,11 @@ class ExportToBlenderThreadWorker(QThread):
in_progress = Signal(str)
def __init__(
- self,
- recording_path: Path,
- blender_file_path: Path,
- blender_executable_path: Path,
- kill_thread_event: threading.Event,
+ self,
+ recording_path: Path,
+ blender_file_path: Path,
+ blender_executable_path: Path,
+ kill_thread_event: threading.Event,
):
super().__init__()
logger.debug("Initializing Export to Blender Thread Worker")
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
index 528102f3..b16b2bad 100644
--- a/freemocap/gui/qt/workers/process_motion_capture_data_thread_worker.py
+++ b/freemocap/gui/qt/workers/process_motion_capture_data_thread_worker.py
@@ -18,7 +18,7 @@ class ProcessMotionCaptureDataThreadWorker(QThread):
in_progress = Signal(object)
def __init__(
- self, post_processing_parameters: ProcessingParameterModel, kill_event: multiprocessing.Event, parent=None
+ self, post_processing_parameters: ProcessingParameterModel, kill_event: multiprocessing.Event, parent=None
):
super().__init__()
self._processing_parameters = post_processing_parameters
diff --git a/freemocap/gui/qt/workers/synchronize_videos_thread_worker.py b/freemocap/gui/qt/workers/synchronize_videos_thread_worker.py
index 37e9aa1c..edbd0e14 100644
--- a/freemocap/gui/qt/workers/synchronize_videos_thread_worker.py
+++ b/freemocap/gui/qt/workers/synchronize_videos_thread_worker.py
@@ -13,12 +13,12 @@ class SynchronizeVideosThreadWorker(QThread):
in_progress = Signal(str)
def __init__(
- self,
- raw_video_folder_path: Path,
- synchronized_video_folder_path: Path,
- kill_thread_event: threading.Event,
- synchronization_method: str = "audio",
- brightness_contrast_threshold: float = 1000,
+ self,
+ raw_video_folder_path: Path,
+ synchronized_video_folder_path: Path,
+ kill_thread_event: threading.Event,
+ synchronization_method: str = "audio",
+ brightness_contrast_threshold: float = 1000,
):
super().__init__()
logger.info("Initializing Synchronize Videos Thread Worker")
diff --git a/freemocap/system/paths_and_filenames/file_and_folder_names.py b/freemocap/system/paths_and_filenames/file_and_folder_names.py
index 408588bb..6c120461 100644
--- a/freemocap/system/paths_and_filenames/file_and_folder_names.py
+++ b/freemocap/system/paths_and_filenames/file_and_folder_names.py
@@ -54,11 +54,11 @@ FREEMOCAP_TEST_DATA_RECORDING_NAME = "freemocap_test_data"
FREEMOCAP_SAMPLE_DATA_RECORDING_NAME = "freemocap_sample_data"
# documentation links
-DOCUMENTATION_HOME = "https://freemocap.github.io/documentation/"
-DOCUMENTATION_WELCOME_URL = "https://freemocap.github.io/documentation/getting_started/"
-DOCUMENTATION_SINGLE_CAMERA_URL = "https://freemocap.github.io/documentation/getting_started/single_camera_recording/"
-DOCUMENTATION_MULTI_CAMERA_URL = "https://freemocap.github.io/documentation/getting_started/multi_camera_calibration/"
-DOCUMENTATION_PRIVACY_POLICY_URL = "https://freemocap.github.io/documentation/community/privacy_policy/"
+DOCUMENTATION_HOME = "https://freemocap.github.io/documentation/index_md.html"
+DOCUMENTATION_WELCOME_URL = "https://freemocap.github.io/documentation/getting-started-index.html"
+DOCUMENTATION_SINGLE_CAMERA_URL = "https://freemocap.github.io/documentation/single-camera-recording.html"
+DOCUMENTATION_MULTI_CAMERA_URL = "https://freemocap.github.io/documentation/multi-camera-calibration.html"
+DOCUMENTATION_PRIVACY_POLICY_URL = "https://freemocap.github.io/documentation/privacy-policy.html"
# logo
PATH_TO_FREEMOCAP_LOGO_SVG = str(Path(freemocap.__file__).parent / "assets/logo/freemocap-logo-black-border.svg")
diff --git a/freemocap/system/user_data/pipedream_pings.py b/freemocap/system/user_data/pipedream_pings.py
index 643a2c21..c3a8b31e 100644
--- a/freemocap/system/user_data/pipedream_pings.py
+++ b/freemocap/system/user_data/pipedream_pings.py
@@ -8,7 +8,7 @@ logger = logging.getLogger(__name__)
class PipedreamPings:
def __init__(
- self,
+ self,
):
self._pipedream_url = "https://eowipinr6rcpbo0.m.pipedream.net"
self._pings_dict = {}
diff --git a/freemocap/tests/conftest.py b/freemocap/tests/conftest.py
index 47827bd0..8541f88e 100644
--- a/freemocap/tests/conftest.py
+++ b/freemocap/tests/conftest.py
@@ -9,10 +9,12 @@ from freemocap.utilities.download_sample_data import (
download_sample_data,
)
+
class SessionInfo:
sample_session_folder_path: str
recording_info_model: RecordingInfoModel
+
def pytest_sessionstart():
SessionInfo.sample_session_folder_path = download_sample_data()
calibration_toml_path = find_calibration_toml_path(SessionInfo.sample_session_folder_path)
diff --git a/freemocap/tests/test_by_camera_reprojection_filtering.py b/freemocap/tests/test_by_camera_reprojection_filtering.py
index d0564e51..22e48411 100644
--- a/freemocap/tests/test_by_camera_reprojection_filtering.py
+++ b/freemocap/tests/test_by_camera_reprojection_filtering.py
@@ -15,30 +15,30 @@ def test_get_camera_frame_marker_lists_to_reproject():
num_cameras_to_remove = 1
expected_output = ([[2], [1]], [0, 1], [1, 2])
assert (
- _get_camera_frame_marker_lists_to_reproject(
- reprojError_cam_frame_marker, frame_marker_list, num_cameras_to_remove
- )
- == expected_output
+ _get_camera_frame_marker_lists_to_reproject(
+ reprojError_cam_frame_marker, frame_marker_list, num_cameras_to_remove
+ )
+ == expected_output
)
# test removing two cameras
frame_marker_list = [(0, 1), (1, 2)]
num_cameras_to_remove = 2
expected_output = ([[2, 0], [1, 2]], [0, 1], [1, 2])
assert (
- _get_camera_frame_marker_lists_to_reproject(
- reprojError_cam_frame_marker, frame_marker_list, num_cameras_to_remove
- )
- == expected_output
+ _get_camera_frame_marker_lists_to_reproject(
+ reprojError_cam_frame_marker, frame_marker_list, num_cameras_to_remove
+ )
+ == expected_output
)
# test removing all cameras
frame_marker_list = [(0, 1), (1, 2)]
num_cameras_to_remove = 3
expected_output = ([[2, 0, 1], [1, 2, 0]], [0, 1], [1, 2])
assert (
- _get_camera_frame_marker_lists_to_reproject(
- reprojError_cam_frame_marker, frame_marker_list, num_cameras_to_remove
- )
- == expected_output
+ _get_camera_frame_marker_lists_to_reproject(
+ reprojError_cam_frame_marker, frame_marker_list, num_cameras_to_remove
+ )
+ == expected_output
)
# test removing more cameras than dimensions
frame_marker_list = [(0, 1), (1, 2)]
@@ -46,20 +46,20 @@ def test_get_camera_frame_marker_lists_to_reproject():
# should just return all of the camera sorted by max reprojection error, no need to error
expected_output = ([[2, 0, 1], [1, 2, 0]], [0, 1], [1, 2])
assert (
- _get_camera_frame_marker_lists_to_reproject(
- reprojError_cam_frame_marker, frame_marker_list, num_cameras_to_remove
- )
- == expected_output
+ _get_camera_frame_marker_lists_to_reproject(
+ reprojError_cam_frame_marker, frame_marker_list, num_cameras_to_remove
+ )
+ == expected_output
)
# test providing no frames or markers
frame_marker_list = []
num_cameras_to_remove = 2
expected_output = ([], [], [])
assert (
- _get_camera_frame_marker_lists_to_reproject(
- reprojError_cam_frame_marker, frame_marker_list, num_cameras_to_remove
- )
- == expected_output
+ _get_camera_frame_marker_lists_to_reproject(
+ reprojError_cam_frame_marker, frame_marker_list, num_cameras_to_remove
+ )
+ == expected_output
)
@@ -69,8 +69,10 @@ def test_set_unincluded_data_to_nans():
frames_with_reprojection_error = [1, 2]
markers_with_reprojection_error = [3, 4]
cameras_to_remove = [[0, 1], [2, 3]]
- result = _set_unincluded_data_to_nans(data, frames_with_reprojection_error, markers_with_reprojection_error, cameras_to_remove)
- for cameras, frame, marker in zip(cameras_to_remove, frames_with_reprojection_error, markers_with_reprojection_error):
+ result = _set_unincluded_data_to_nans(data, frames_with_reprojection_error, markers_with_reprojection_error,
+ cameras_to_remove)
+ for cameras, frame, marker in zip(cameras_to_remove, frames_with_reprojection_error,
+ markers_with_reprojection_error):
for camera in cameras:
np.testing.assert_array_equal(result[camera, frame, marker, :], np.full((2,), np.nan))
@@ -80,9 +82,11 @@ def test_set_unincluded_data_to_nans():
markers_with_reprojection_error = [3, 4]
cameras_to_remove = [[0, 1], [2, 3]]
original_data = data.copy()
- result = _set_unincluded_data_to_nans(data, frames_with_reprojection_error, markers_with_reprojection_error, cameras_to_remove)
+ result = _set_unincluded_data_to_nans(data, frames_with_reprojection_error, markers_with_reprojection_error,
+ cameras_to_remove)
mask = np.ones(data.shape, dtype=bool)
- for cameras, frame, marker in zip(cameras_to_remove, frames_with_reprojection_error, markers_with_reprojection_error):
+ for cameras, frame, marker in zip(cameras_to_remove, frames_with_reprojection_error,
+ markers_with_reprojection_error):
for camera in cameras:
mask[camera, frame, marker, :] = False
np.testing.assert_array_equal(result[mask], original_data[mask])
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
index d5a5ce4c..a3b148c6 100644
--- a/freemocap/tests/test_total_body_center_of_mass_data_shape.py
+++ b/freemocap/tests/test_total_body_center_of_mass_data_shape.py
@@ -11,7 +11,7 @@ from freemocap.utilities.get_number_of_frames_of_videos_in_a_folder import (
@pytest.mark.usefixtures("total_body_center_of_mass_data")
def test_total_body_center_of_mass_data_exists(
- total_body_center_of_mass_data: Union[str, Path],
+ total_body_center_of_mass_data: Union[str, Path],
):
assert Path(
total_body_center_of_mass_data
@@ -20,8 +20,8 @@ def test_total_body_center_of_mass_data_exists(
@pytest.mark.usefixtures("synchronized_video_folder_path", "total_body_center_of_mass_data")
def test_total_body_center_of_mass_data_shape(
- synchronized_video_folder_path: Union[str, Path],
- total_body_center_of_mass_data: Union[str, Path, np.ndarray],
+ synchronized_video_folder_path: Union[str, Path],
+ total_body_center_of_mass_data: Union[str, Path, np.ndarray],
):
if isinstance(total_body_center_of_mass_data, (str, Path)):
total_body_center_of_mass_fr_xyz = np.load(total_body_center_of_mass_data)
@@ -30,16 +30,15 @@ def test_total_body_center_of_mass_data_shape(
frame_counts = list(get_number_of_frames_of_videos_in_a_folder(synchronized_video_folder_path).values())
assert (
- len(set(frame_counts)) == 1
+ len(set(frame_counts)) == 1
), f"Videos in {synchronized_video_folder_path} have different frame counts: {frame_counts}"
number_of_frames = frame_counts[0]
assert (
- total_body_center_of_mass_fr_xyz.shape[0] == number_of_frames
+ total_body_center_of_mass_fr_xyz.shape[0] == number_of_frames
), f"Number of frames in {total_body_center_of_mass_fr_xyz.shape} does not match number of frames of videos in {synchronized_video_folder_path}"
assert (
- total_body_center_of_mass_fr_xyz.shape[1] == 3
+ total_body_center_of_mass_fr_xyz.shape[1] == 3
), f"total body center of mass should have 3 dimensions (X,Y,Z) but has {total_body_center_of_mass_fr_xyz.shape[1]}"
-
diff --git a/freemocap/utilities/update_1_4_path_names.py b/freemocap/utilities/update_1_4_path_names.py
index 9e657e57..16b820b7 100644
--- a/freemocap/utilities/update_1_4_path_names.py
+++ b/freemocap/utilities/update_1_4_path_names.py
@@ -1,6 +1,5 @@
-from typing import Optional, Union
from pathlib import Path
-
+from typing import Optional, Union
from freemocap.system.paths_and_filenames.file_and_folder_names import (
RAW_DATA_FOLDER_NAME,
@@ -30,7 +29,7 @@ def update_1_4_path_names(freemocap_data_folder_path: Optional[Union[str, Path]]
def update_recording_folder(recording_folder: Path) -> None:
if (
- recording_folder.name == OUTPUT_DATA_FOLDER_NAME
+ recording_folder.name == OUTPUT_DATA_FOLDER_NAME
): # this covers cases where the recording folder isn't a subfolder of a session
rename_skeleton_file_path(recording_folder)
if (recording_folder / RAW_DATA_FOLDER_NAME).exists():
diff --git a/poetry_pyproject.toml b/poetry_pyproject.toml
deleted file mode 100644
index d360199f..00000000
--- a/poetry_pyproject.toml
+++ /dev/null
@@ -1,74 +0,0 @@
-[tool.poetry]
-name = "freemocap"
-version = "1.0.28"
-description = "A free and open source markerless motion capture system for everyone πŸ’€βœ¨"
-authors = ["Skelly FreeMoCap <[email protected]>"]
-license = "AGPLv3"
-readme = "README.md"
-
-[project.urls]
-Homepage = "https://freemocap.org"
-Documentation = "https://freemocap.github.io/documentation/"
-Github = "https://github.com/freemocap/freemocap"
-Issues = "https://github.com/freemocap/freemocap/issues"
-Community_Discord = "https://discord.gg/uTvkkJnSff"
-
-[tool.poetry.dependencies]
-python = ">=3.9,<3.12"
-skellycam = "2023.9.1086"
-skelly_viewer = "2023.5.1019"
-skellyforge = "2023.9.1004"
-skelly_synchronize = "2023.10.1027"
-mediapipe = "^0.10.7"
-opencv-contrib-python = "4.8.*"
-toml = "0.10.2"
-aniposelib = "0.4.3"
-libsass = "0.21.0"
-ipykernel = "6.23.1"
-plotly = "^5.17.1"
-pydantic = "1.*"
-packaging = "^23.2"
-ajc27-freemocap-blender-addon = "^0.2.14"
-numpy = "^1.23.5"
-
-
-[tool.poetry.group.dev.dependencies]
-black = "^23.9.1"
-pre-commit = "^3.4.0"
-pyinstaller = "^6.0.0"
-pytest = "*"
-pytest-cov = "^4.1.0"
-bumpver = "^2023.1129"
-flake8 = "^6.0.0"
-flake8-bandit = "^4.1.1"
-flake8-bugbear = "^23.9.16"
-
-[build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"
-
-[tool.bumpver]
-current_version = "v1.0.25"
-version_pattern = "vMAJOR.MINOR.PATCH[-TAG]"
-commit_message = "Bump version {old_version} -> {new_version}"
-commit = true
-tag = true
-push = true
-
-[tool.bumpver.file_patterns]
-"freemocap/__init__.py" = ["{version}"]
-
-[project.scripts]
-freemocap = "freemocap.__main__:main"
-
-[tool.setuptools]
-py-modules = ["freemocap"]
-
-[tool.black]
-line-length = 120
-
-[tool.taskipy.tasks]
-setup = "pre-commit install"
-installer = "./bin/installer.sh"
-format = "black freemocap"
-