Merge branch 'master' into tlem-joint-view

.github/workflows/test-self-hosted.yml

@@ -11,7 +11,7 @@ on:
       custom-anybodycon-name:
           description: 'Name of the custom AnyBody version to use. (E.g. path on the I:\ drive)'
           required: false
-          default: 'AnyBody.7.5-CI-master.AnyBody.7.5.x/AnyBodyCon.exe'
+          default: 'AnyBody.7.5-CI-master.AnyBody.8.0.x/AnyBodyCon.exe'
       custom-pytest-arg:
           description: 'Specify which test to run. E.g. `Tests/test_example.any`. Default is entire test suite.'
           required: false

.github/workflows/test.yml

@@ -15,7 +15,7 @@ on:
       custom-anybodycon-name:
           description: 'Name of the custom AnyBody version to use. (E.g. path on the I:\ drive)'
           required: false
-          default: 'AnyBody.7.5-CI-master.AnyBody.7.5.x/AnyBodyCon.exe'
+          default: 'AnyBody.7.5-CI-master.AnyBody.8.0.x/AnyBodyCon.exe'
       custom-pytest-arg:
           description: 'Specify which test to run. E.g. `Tests/test_example.any`. Default is entire test suite.'
           required: false

AMMR.version.any

@@ -7,9 +7,9 @@
 
 #if (ANYBODY_V1 < 7) | (ANYBODY_V1 == 7 & ANYBODY_V2 < 5) | (ANYBODY_V1 == 7 & ANYBODY_V2 == 5 & ANYBODY_V4 < 10984 )
 //
-// This model repository needs at least AnyBody version 7.5-beta7 to load correctly. 
+// This model repository needs at least AnyBody version 8.0 to load correctly. 
 // --> See https://forum.anyscript.org/t/become-a-beta-tester 
 //    to get access to the newest versions of AMS
 //
-#NOT_SUPPORTED__++++++++++++++__AnyBody_v7.5_beta7_or_higher_is_required_for_AMMR_v2.5__+++++++++++++++++++__
+#NOT_SUPPORTED__++++++++++++++__AnyBody_v8.0_beta_or_higher_is_required_for_AMMR_v3.0__+++++++++++++++++++__
 #endif

Application/Examples/FemoralTorsion/libdef.any

@@ -2,6 +2,6 @@
 // Double click the following line for a guide:
 // #path HTML_DOC "<ANYBODY_PATH_INSTALLDIR>/AMMR/getting_started.html"
 // For example...
-//#include "<ANYBODY_PATH_MYFILES>/AnyBody.7.5.x/AMMR.v2.5.0-Demo/libdef.any"
+//#include "<ANYBODY_PATH_MYFILES>/AnyBody.8.0.x/AMMR.v3.0.0-Demo/libdef.any"
 
 #include "../libdef.any"

Application/Examples/StandingModel/libdef.any

@@ -2,6 +2,6 @@
 // Double click the following line for a guide:
 // #path HTML_DOC "<ANYBODY_PATH_INSTALLDIR>/AMMR/getting_started.html"
 // For example...
-//#include "<ANYBODY_PATH_MYFILES>/AnyBody.7.5.x/AMMR.v2.5.0-Demo/libdef.any"
+//#include "<ANYBODY_PATH_MYFILES>/AnyBody.8.0.x/AMMR.v3.0.0-Demo/libdef.any"
 
 #include "../libdef.any"

Application/Examples/StatisticalScalingPlugin/libdef.any

@@ -2,6 +2,6 @@
 // Double click the following line for a guide:
 // #path HTML_DOC "<ANYBODY_PATH_INSTALLDIR>/AMMR/getting_started.html"
 // For example...
-//#include "<ANYBODY_PATH_MYFILES>/AnyBody.7.5.x/AMMR.v2.5.0-Demo/libdef.any"
+//#include "<ANYBODY_PATH_MYFILES>/AnyBody.8.0.x/AMMR.v3.0.0-Demo/libdef.any"
 
 #include "../libdef.any"

CHANGELOG.md

@@ -159,7 +159,7 @@ achieve same marker position and joint angle output.
   `AnySurfCylinderFit` have been changed. Since `AnySurfCylinderFit` is now a
   sub class of `AnyRefNode` it should no longer be nested inside inside an other
   parent reference frame to provide the pos `sRel` and orientation `ARel`. This
-  fixes a number of deprecated warnings which would have triggered with AMS 7.5. 
+  fixes a number of deprecated warnings which would have triggered with AnyBody version 8. 
 
 * Added new `AnatomicalFrameTrunk` reference frame to pelvis segment consistent
   with anatomical frames in rest of the trunk model. All joint angles relative

Docs/Applications/images/get_application_images.py

@@ -11,7 +11,7 @@
 APP_FOLDER = Path(__file__).parent / "../../../Tests/Applications"
 MOCAP_FOLDER = Path(__file__).parent / "../../../Tests/AnyMocap"
 app_opts = {
-    "anybodycon_path": r"C:\Program Files\AnyBody Technology\AnyBody.7.5_Beta\AnyBodyCon.exe",
+    "anybodycon_path": os.path.expandvars("${LocalAppData}\Programs\AnyBody Technology\AnyBody.8.0_Beta\AnyBodyCon.exe"),
     "num_processes": 2,
 }
 

Docs/creating_model_from_scratch.md

@@ -34,7 +34,7 @@ Otherwise, make the necessary changes.
 ```{code-block} AnyScriptDoc
 :emphasize-lines: 1
 
-#include "<ANYBODY_PATH_MYFILES>/AnyBody.7.5.x/AMMR.v2.5.0-Demo/libdef.any"
+#include "<ANYBODY_PATH_MYFILES>/AnyBody.8.0.x/AMMR.v3.0.0-Demo/libdef.any"
 Main =
 {
 
@@ -52,7 +52,7 @@ Kinematics and Inverse Dynamics simulations on your model.
 ```{code-block} AnyScriptDoc
 :emphasize-lines: 4-8,11-16
 
-#include "<ANYBODY_PATH_MYFILES>/AnyBody.7.5.x/AMMR.v2.5.0-Demo/libdef.any"
+#include "<ANYBODY_PATH_MYFILES>/AnyBody.8.0.x/AMMR.v3.0.0-Demo/libdef.any"
 Main =
 {
 
@@ -88,7 +88,7 @@ two `AnyBodyStudy` objects - one with references to (human & chair) and the othe
 ```{code-block} AnyScriptDoc
 :emphasize-lines: 13
 
-#include "<ANYBODY_PATH_MYFILES>/AnyBody.7.5.x/AMMR.v2.5.0-Demo/libdef.any"
+#include "<ANYBODY_PATH_MYFILES>/AnyBody.8.0.x/AMMR.v3.0.0-Demo/libdef.any"
 Main =
 {
 
@@ -119,7 +119,7 @@ the human body model alone. The file path `<ANYBODY_PATH_BODY>` is defined in `l
 ```{code-block} AnyScriptDoc
 :emphasize-lines: 4
 
-#include "<ANYBODY_PATH_MYFILES>/AnyBody.7.5.x/AMMR.v2.5.0-Demo/libdef.any"
+#include "<ANYBODY_PATH_MYFILES>/AnyBody.8.0.x/AMMR.v3.0.0-Demo/libdef.any"
 Main =
 {
     #include "<ANYBODY_PATH_BODY>/HumanModel.any"
@@ -150,7 +150,7 @@ Create a reference to the human body model inside `Model` so that it is consider
 ```{code-block} AnyScriptDoc
 :emphasize-lines: 8
 
-#include "<ANYBODY_PATH_MYFILES>/AnyBody.7.5.x/AMMR.v2.5.0-Demo/libdef.any"
+#include "<ANYBODY_PATH_MYFILES>/AnyBody.8.0.x/AMMR.v3.0.0-Demo/libdef.any"
 Main =
 {
     #include "<ANYBODY_PATH_BODY>/HumanModel.any"
@@ -197,7 +197,7 @@ constraints enforced by soft drivers. The alternative would have been to create
 ```{code-block} AnyScriptDoc
 :emphasize-lines: 9,20-21
 
-#include "<ANYBODY_PATH_MYFILES>/AnyBody.7.5.x/AMMR.v2.5.0-Demo/libdef.any"
+#include "<ANYBODY_PATH_MYFILES>/AnyBody.8.0.x/AMMR.v3.0.0-Demo/libdef.any"
 Main =
 {
     #include "<ANYBODY_PATH_BODY>/HumanModel.any"
@@ -236,7 +236,7 @@ of the Pelvis w.r.t ground.
 ```{code-block} AnyScriptDoc
 :emphasize-lines: 11-19
 
-#include "<ANYBODY_PATH_MYFILES>/AnyBody.7.5.x/AMMR.v2.5.0-Demo/libdef.any"
+#include "<ANYBODY_PATH_MYFILES>/AnyBody.8.0.x/AMMR.v3.0.0-Demo/libdef.any"
 Main =
 {
     #include "<ANYBODY_PATH_BODY>/HumanModel.any"

Tests/recreate_mocap_intermediate_files.py

@@ -12,7 +12,6 @@
 mocap_path = pathlib.Path(__file__).parent.parent / "Application/MocapExamples"
 
 
-
 macros1 =[
     [
         mc.Load(mocap_path / "Plug-in-gait_MultiTrial_StandingRef\Subjects\S1\S1_StandingRef\Main.any"),
@@ -55,12 +54,11 @@
 ]
 
 
-abc_path = r"C:\Program Files\AnyBody Technology\AnyBody.7.5_Beta\AnyBodyCon.exe"
+abc_path = None
 
 app1 = anypytools.AnyPyProcess(anybodycon_path=abc_path, num_processes=10)
 
 app1.start_macro(macros1)
 
 app2 = anypytools.AnyPyProcess(anybodycon_path=abc_path)
 app2.start_macro(macros2)
-

Tools/Templates/libdef.any

@@ -3,7 +3,7 @@
 // #path HTML_DOC "<ANYBODY_PATH_INSTALLDIR>/AMMR/getting_started.html"
 
 // Forexample...
-//#include "<ANYBODY_PATH_MYFILES>/AnyBody.7.5.x/AMMR.v2.5.0-Demo/libdef.any"
+//#include "<ANYBODY_PATH_MYFILES>/AnyBody.8.0.x/AMMR.v3.0.0-Demo/libdef.any"
 //#include "../libdef.any"
 #ifndef LIBDEF_ANY
 #include "<ANYBODY_PATH_INSTALLDIR>/AMMR/libdef.any"

pixi.toml

@@ -19,5 +19,5 @@ azure-storage-blob = "12.19.0.*"
 nomkl = "*"
 
 [target.win-64.dependencies]
-anybodycon = "7.5.*"
+anybodycon = ">=7.5.0Beta"