Merge pull request #5 from qualisys/release/1.1.9

Release/1.1.9

Author: LiborSoumar

.gitattributes

@@ -0,0 +1 @@
+*.exe filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -1 +1,2 @@
-Data
+Data
+/Templates/Assets/Programs/Theia-Tools/Theia-Tools.exe

README.md

@@ -4,16 +4,15 @@
 
 To download the latest version (not tested) of the example project to your computer, you can either:
 
-* [Click here](https://github.com/qualisys/paf-theia-markerless-true-hybrid-example/archive/refs/heads/main.zip) to download it as a zip file.
+* [Click here](https://github.com/qualisys/paf-theia-markerless-true-hybrid-example/releases/latest) to download the latest release.
 <br>_— or —_
 * Clone this repository to your computer.
 
-To download a release version (tested), please [Click here](https://github.com/qualisys/paf-theia-markerless-true-hybrid-example/releases)
-
 ## Preparing QTM project
 There are two ways how to set up the project for QTM.
 1. Simple method is to unzip the zip file and open the project from QTM (File > Open Project) or by double clicking on Settings.paf in File Explorer.
-2. If you plan to create multiple projects based on this example, unzip the zip file to `C:\Program Files (x86)\Qualisys\Qualisys Track Manager\Packages` or to C:\Program Files\Qualisys\Qualisys Track Manager\Packages in case of using QTM 64 bit, name the folder `Theia Markerless Example` and delete Settings.qtmproj. Then go to QTM > File > New Project and create new project based on Theia Markerless Example.
+2. Download TheiaTools from the corresponding [release](https://github.com/qualisys/paf-theia-markerless-true-hybrid-example/releases/latest) and move the extracted contents into the `Templates/Assets/Programs/Theia-Tools/` folder in the project directory.
+3. If you plan to create multiple projects based on this example, unzip the zip file to `C:\Program Files (x86)\Qualisys\Qualisys Track Manager\Packages` or to C:\Program Files\Qualisys\Qualisys Track Manager\Packages in case of using QTM 64 bit, name the folder `Theia Markerless Example` and delete Settings.qtmproj. Then go to QTM > File > New Project and create new project based on Theia Markerless Example.
 
 ## Preparing Qualisys data for Theia3D processing
 

Settings.paf

@@ -1,7 +1,7 @@
 Project ID: Open PAF Theia Markerless Example
 Package Information:
   Name: Theia Markerless Example True Hybrid
-  Version: 1.1.8
+  Version: 1.1.9
   Required QTM version: 2020.2.5770
   Encoding bytes: �����
 

Templates/Assets/Programs/Theia-Tools/Theia-Tools.exe

@@ -344,3 +344,39 @@ Add_Landmark
 ! /REFERENCE_LOCATION_NAME=
 ! /USE_REFERENCE_LOCATION=FALSE
 ;
+Add_Landmark
+/LANDMARK_NAME=Lab_Origin
+! /CALIBRATION_FILE=
+! /USER_GENERATED=TRUE
+! /USE_PERCENTAGE=FALSE
+! /CALIBRATION_ONLY=FALSE
+! /USE_TARGETS=FALSE
+/SEGMENT_NAME=LAB
+! /TARGET_TYPES=
+! /TARGET_NAMES=
+! /MCS_ML=0.0
+! /MCS_AP=0.0
+! /MCS_AXIAL=0
+! /LANDMARK_LOCATION=
+! /REFERENCE_LOCATION_TYPE=
+! /REFERENCE_LOCATION_NAME=
+! /USE_REFERENCE_LOCATION=FALSE
+;
+Add_Landmark
+/LANDMARK_NAME=Lab_Z
+! /CALIBRATION_FILE=
+! /USER_GENERATED=TRUE
+! /USE_PERCENTAGE=FALSE
+! /CALIBRATION_ONLY=FALSE
+! /USE_TARGETS=FALSE
+/SEGMENT_NAME=LAB
+! /TARGET_TYPES=
+! /TARGET_NAMES=
+! /MCS_ML=0.0
+! /MCS_AP=0.0
+/MCS_AXIAL=0.1
+! /LANDMARK_LOCATION=
+! /REFERENCE_LOCATION_TYPE=
+! /REFERENCE_LOCATION_NAME=
+! /USE_REFERENCE_LOCATION=FALSE
+;

Templates/Assets/Programs/Theia-Tools/third_party_licenses.txt

@@ -15,19 +15,31 @@ Manage_Theia3D_Merge
 /MERGE_THEIA3D_AND_OTHER_FILES=TRUE
 /THEIA3D_SESSION_FOLDER=TheiaFormatData
 /THEIA3D_FILE_MASK=*pose_subject.c3d
-! /THEIA3D_PREFIX=
-! /THEIA3D_SUBJECT_TAG=
+! /THEIA3D_PREFIX= 
+! /THEIA3D_SUBJECT_TAG= 
 /OTHER3D_SESSION_FOLDER=<?=$session["Filename"];?> 
 /OTHER3D_FILE_MASK=<?echo "*Dynamic*.c3d";?> 
 /OTHER3D_MODEL_MASK=<?echo "*Object*.c3d";?> 
-/OTHER3D_MODEL_TEMPLATE_MASK=<?=$template_directory . "Object.mdh";?> 
+/OTHER3D_MODEL_TEMPLATE_MASK=<?=$template_directory . "object.mdh";?> 
 ! /OTHER3D_PREFIX=
 ! /OTHER3D_SUBJECT_TAG=
 ! /NUMBER_OF_SESSION_FILES_ALLOWED=
 /SAVE_DEFAULT_CMZ_FILES=FALSE
 ! /OPEN_CMZ_LIBRARY=FALSE
 /INPUT_FOLDER_STRUCTURE=QTM
-! /VISUAL3D_PIPELINE=
+! /VISUAL3D_PIPELINE= 
+;
+
+Append_Model_Template
+/CALIBRATION_FILE=*Object*.c3d
+/MODEL_TEMPLATE=<?=$template_directory . "object.mdh";?> 
+! /VIEW_BUILDMODEL_RESULTS=2
+;
+
+Build_Model
+!/CALIBRATION_FILE=
+/REBUILD_ALL_MODELS=TRUE
+! /DISPLAY_RESULTS=TRUE
 ;
 
 <?

Templates/append_model.mdh

@@ -129,60 +129,7 @@ Append_Model_Template
 Set_Segment_Auto_Assign_Force
 ! /CALIBRATION_FILE=
 /SEGMENT_NAMES=RTO+LTO+RFT+LFT
-/USE_FOR_AUTO_ASSIGN=FALSE+FALSE+TRUE+TRUE
-;
-
-!Make LTO amd RTO segment kinematic only
-Set_Segment_Properties
-/CALIBRATION_FILE=*_static.c3d
-/SEGMENT_NAME=LTO
-/KINEMATIC_ONLY=TRUE
-! /MASS=
-! /CG_FROM_PROX_AXIAL=
-! /CG_FROM_PROX_ML=
-! /CG_FROM_PROX_AP=
-! /INERTIA_XX=
-! /INERTIA_YY=
-! /INERTIA_ZZ=
-! /AP_DIRECTION=
-! /AXIAL_DIRECTION=
-! /MODEL_FILE=
-! /MATERIAL_FILE=
-! /GRAPHICS_ROT_X=
-! /GRAPHICS_ROT_Y=
-! /GRAPHICS_ROT_Z=
-! /GRAPHICS_SCALE_X=
-! /GRAPHICS_SCALE_Y=
-! /GRAPHICS_SCALE_Z=
-! /GRAPHICS_TRANSLATE_X=
-! /GRAPHICS_TRANSLATE_Y=
-! /GRAPHICS_TRANSLATE_Z=
-;
-
-Set_Segment_Properties
-/CALIBRATION_FILE=*_static.c3d
-/SEGMENT_NAME=RTO
-/KINEMATIC_ONLY=TRUE
-! /MASS=
-! /CG_FROM_PROX_AXIAL=
-! /CG_FROM_PROX_ML=
-! /CG_FROM_PROX_AP=
-! /INERTIA_XX=
-! /INERTIA_YY=
-! /INERTIA_ZZ=
-! /AP_DIRECTION=
-! /AXIAL_DIRECTION=
-! /MODEL_FILE=
-! /MATERIAL_FILE=
-! /GRAPHICS_ROT_X=
-! /GRAPHICS_ROT_Y=
-! /GRAPHICS_ROT_Z=
-! /GRAPHICS_SCALE_X=
-! /GRAPHICS_SCALE_Y=
-! /GRAPHICS_SCALE_Z=
-! /GRAPHICS_TRANSLATE_X=
-! /GRAPHICS_TRANSLATE_Y=
-! /GRAPHICS_TRANSLATE_Z=
+/USE_FOR_AUTO_ASSIGN=TRUE+TRUE+FALSE+FALSE
 ;
 
 Set_Segment_Properties