Skip to content

Commit f056afb

Browse files
melundmelund
authored
Merge branch 'master' into update-video-template
2 parents b385e78 + 6569dac commit f056afb

File tree

69 files changed

+5307
-5104
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+5307
-5104
lines changed

‎Application/MocapExamples/ADL_Gait_[beta]/CreateVideo.any

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11

22
// See following file for more information on the camera class template
33
// and options.
4-
// #include "<ANYBODY_PATH_MODELUTILS>/Video/VideoLookAtCamera.any"
54
#include "<ANYBODY_PATH_MODELUTILS>/Video/VideoLookAtCamera.any"
65

76

‎Application/MocapExamples/ADL_Gait_[beta]/ExtraDrivers.any

+5-4
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,11 @@ AnyFolder ExtraDrivers = {
2222

2323
#define BM_MANNEQUIN_DRIVER_NECK ON
2424

25-
26-
// #define BM_MANNEQUIN_DRIVER_ANKLE_SUBTALAR_EVERSION_RIGHT ON
27-
// #define BM_MANNEQUIN_DRIVER_ANKLE_SUBTALAR_EVERSION_LEFT ON
28-
25+
#ifdef REFERENCE_TRIAL
26+
#define BM_MANNEQUIN_DRIVER_PELVIS_THORAX_EXTENSION ON
27+
Main.HumanModel.DefaultMannequinDrivers.PostureDriverExtension.CType = {Soft};
28+
#endif
29+
2930
// #define BM_MANNEQUIN_DRIVER_STERNOCLAVICULAR_PROTRACTION_RIGHT ON
3031
// #define BM_MANNEQUIN_DRIVER_STERNOCLAVICULAR_PROTRACTION_LEFT ON
3132

‎Application/MocapExamples/ADL_Gait_[beta]/LabSpecificData.any

+37-3
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Main.ModelSetup.LabSpecificData = {
3535
};
3636

3737
Main.Studies.ParameterIdentification.KinematicStudyForParameterIdentification= {
38-
Kinematics.KinematicTol = 1e-4;
38+
Kinematics.KinematicTol = 1e-6;
3939
};
4040
Main.ModelSetup.TrialSpecificData.ParameterOptimizationConvergenceTol = 1e-2;
4141

@@ -84,8 +84,8 @@ Main.ModelSetup.LabSpecificData = {
8484
LEFT_UPPERARM_LENGTH = ON,
8585
RIGHT_LOWERARM_LENGTH= ON,
8686
LEFT_LOWERARM_LENGTH = ON,
87-
RIGHT_HAND_LENGTH= ON,
88-
LEFT_HAND_LENGTH = ON,
87+
RIGHT_HAND_LENGTH= OFF,
88+
LEFT_HAND_LENGTH = OFF,
8989
RIGHT_HAND_BREADTH= OFF,
9090
LEFT_HAND_BREADTH = OFF,
9191
RIGHT_TIBIAL_TORSION = ON,
@@ -101,12 +101,46 @@ Main.ModelSetup.LabSpecificData = {
101101
Head.LengthScale = Thorax.LengthScale;
102102
Head.DepthScale = Head.LengthScale;
103103
Head.WidthScale = Head.LengthScale;
104+
Right.Hand.LengthScale = BodyScale;
105+
Left.Hand.LengthScale = BodyScale;
106+
Right.Hand.WidthScale = BodyScale;
107+
Left.Hand.WidthScale = BodyScale;
104108

105109
};
106110

107111
#else
108112
OptimizeAnthropometricsOnOff OptimizeAntropometricsOnOff ={};
109113
#endif
114+
115+
116+
// Initial guess of arm segment length based on markers.
117+
Main.HumanModel.Anthropometrics.SegmentDimensions = {
118+
119+
120+
#ifdef _c3dmarker
121+
#undef _c3dmarker
122+
#endif
123+
124+
#define _c3dmarker(NAME) Main.ModelSetup.C3DFileData.Points.Markers.NAME.Pos[Main.ModelSetup.TrialSpecificData.AutoPos.start_idx]
125+
126+
Right.LowerArmLength = 0.91*vnorm(_c3dmarker(R_HLE)- _c3dmarker(R_RSP));
127+
#ifndef EXCLUDE_R_SAA
128+
Right.UpperArmLength = 0.83*vnorm(_c3dmarker(R_HLE)- _c3dmarker(R_SAA));
129+
#else
130+
Right.UpperArmLength = 0.83*vnorm(_c3dmarker(R_HLE)- _c3dmarker(R_SAE));
131+
#endif
132+
133+
Left.LowerArmLength = 0.91*vnorm(_c3dmarker(L_HLE)- _c3dmarker(L_RSP));
134+
#ifndef EXCLUDE_L_SAA
135+
Left.UpperArmLength = 0.83*vnorm(_c3dmarker(L_HLE)- _c3dmarker(L_SAA));
136+
#else
137+
Left.UpperArmLength = 0.83*vnorm(_c3dmarker(L_HLE)- _c3dmarker(L_SAE));
138+
#endif
139+
140+
141+
};
142+
143+
110144

111145
#ifndef REFERENCE_TRIAL
112146
#define MOCAP_CREATE_PARAMETER_ID_SHORTCUT OFF

‎Application/MocapExamples/ADL_Gait_[beta]/MarkerProtocol.any

+23-16
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ PlaceMarkerAt=AnatomicalFrame,
296296
OptX=OFF,OptY=ON,OptZ=OFF,
297297
UseC3DWeightResiduals = ON
298298
) = {
299-
sRelOpt = {0.05, -0.02, 0.0};
299+
sRelOpt = {0.05, -0.02, 0.015};
300300
};
301301
#endif
302302

@@ -311,7 +311,7 @@ OptX=OFF,OptY=ON,OptZ=ON,
311311
UseC3DWeightResiduals = ON,
312312
PlaceMarkerAt = FibularHead
313313
) = {
314-
sRelOpt = {0.013, -0.009, 0.025};
314+
sRelOpt = {0.005, -0.009, 0.025};
315315
};
316316
#endif
317317

@@ -324,7 +324,7 @@ PlaceMarkerAt = LateralMalleolus,
324324
OptX=OFF,OptY=OFF,OptZ=ON,
325325
UseC3DWeightResiduals = ON
326326
) = {
327-
sRelOpt = {0.01, -0.0, 0.015};
327+
sRelOpt = {0.00, -0.0, 0.015};
328328
};
329329
#endif
330330

@@ -455,7 +455,7 @@ PlaceMarkerAt=AnatomicalFrame,
455455
OptX=OFF,OptY=ON,OptZ=OFF,
456456
UseC3DWeightResiduals = ON
457457
) = {
458-
sRelOpt = {0.05, -0.02, 0.0};
458+
sRelOpt = {0.05, -0.02, -0.015};
459459
};
460460
#endif
461461

@@ -467,7 +467,7 @@ OptX=OFF,OptY=ON,OptZ=ON,
467467
UseC3DWeightResiduals = ON,
468468
PlaceMarkerAt = FibularHead
469469
) = {
470-
sRelOpt = {0.013, -0.009, -0.025};
470+
sRelOpt = {0.005, -0.009, -0.025};
471471
};
472472
#endif
473473

@@ -480,7 +480,7 @@ PlaceMarkerAt = LateralMalleolus,
480480
OptX=OFF,OptY=OFF,OptZ=ON,
481481
UseC3DWeightResiduals = ON
482482
) = {
483-
sRelOpt = {-0.00, -0.0, -0.015};
483+
sRelOpt = {0.00, -0.0, -0.015};
484484
};
485485
#endif
486486

@@ -559,7 +559,6 @@ CreateMarkerDriver R_SAE (
559559
MarkerPlacement=Right.ShoulderArm.Seg.Clavicula,
560560
OptX=OFF,OptY=OFF,OptZ=OFF,
561561
UseC3DWeightResiduals = ON,
562-
WeightX=5,WeightY=5,WeightZ=5,
563562
PlaceMarkerAt = acj
564563
) = {
565564
sRelOpt = {0.020, 0.005, -0.038};
@@ -577,6 +576,7 @@ UseC3DWeightResiduals = ON
577576
) = {
578577
sRelOpt = {-0.04,0,0};
579578
#ifdef REFERENCE_TRIAL
579+
ConstMarkerWeightX = 5;
580580
ConstMarkerWeightZ = 5;
581581
#endif
582582
};
@@ -651,7 +651,7 @@ UseC3DWeightResiduals = ON
651651
CreateMarkerDriver R_HM2 (
652652
MarkerPlacement=Right.ShoulderArm.Seg.Hand,
653653
PlaceMarkerAt=AnatomicalFrame,
654-
OptX=OFF,OptY=OFF,OptZ=OFF,
654+
OptX=ON,OptY=OFF,OptZ=OFF,
655655
WeightX=0.3,WeightY=0.3,WeightZ=0.3,
656656
UseC3DWeightResiduals = ON
657657
) = {
@@ -664,17 +664,21 @@ UseC3DWeightResiduals = ON
664664
// Marker on the Right Finger
665665
CreateMarkerDriver R_HM5 (
666666
MarkerPlacement=Right.ShoulderArm.Seg.Hand,
667-
OptX=OFF,OptY=ON,OptZ=OFF,
667+
OptX=ON,OptY=ON,OptZ=OFF,
668668
WeightX=0.3,WeightY=0.3,WeightZ=0.3,
669669
PlaceMarkerAt=AnatomicalFrame,
670670
UseC3DWeightResiduals = ON
671671
) = {
672672
sRelOpt = {-0.08,0.033, 0.00};
673-
674-
675673
};
676674
#endif
677675

676+
#ifdef _R_HM5
677+
#ifdef _R_HM2
678+
LinkDesignVars SymetricRightHandMarkers_XDIR(DesVar1=R_HM2_X, DesVar2=R_HM5_X)={};
679+
#endif
680+
#endif
681+
678682

679683

680684
#ifdef _L_SAE
@@ -683,7 +687,6 @@ CreateMarkerDriver L_SAE (
683687
MarkerPlacement=Left.ShoulderArm.Seg.Clavicula,
684688
OptX=OFF,OptY=OFF,OptZ=OFF,
685689
UseC3DWeightResiduals = ON,
686-
WeightX=5,WeightY=5,WeightZ=5,
687690
PlaceMarkerAt = acj
688691
) = {
689692
sRelOpt = {0.020, -0.005, -0.038};
@@ -702,6 +705,7 @@ UseC3DWeightResiduals = ON
702705
sRelOpt = {0.04,0,0};
703706
#ifdef REFERENCE_TRIAL
704707
ConstMarkerWeightZ = 5;
708+
ConstMarkerWeightX = 5;
705709
#endif
706710
};
707711
#ifdef _L_HLE
@@ -772,7 +776,7 @@ UseC3DWeightResiduals = ON
772776
CreateMarkerDriver L_HM2 (
773777
MarkerPlacement=Left.ShoulderArm.Seg.Hand,
774778
PlaceMarkerAt=AnatomicalFrame,
775-
OptX=OFF,OptY=OFF,OptZ=OFF,
779+
OptX=ON,OptY=OFF,OptZ=OFF,
776780
WeightX=0.3,WeightY=0.3,WeightZ=0.3,
777781
UseC3DWeightResiduals = ON
778782
) = {
@@ -784,7 +788,7 @@ UseC3DWeightResiduals = ON
784788
// Marker on the Finger 5
785789
CreateMarkerDriver L_HM5 (
786790
MarkerPlacement=Left.ShoulderArm.Seg.Hand,
787-
OptX=OFF,OptY=ON,OptZ=OFF,
791+
OptX=ON,OptY=ON,OptZ=OFF,
788792
WeightX=0.3,WeightY=0.3,WeightZ=0.3,
789793
PlaceMarkerAt=AnatomicalFrame,
790794
UseC3DWeightResiduals = ON
@@ -793,8 +797,11 @@ UseC3DWeightResiduals = ON
793797
};
794798
#endif
795799

796-
797-
800+
#ifdef _L_HM5
801+
#ifdef _L_HM2
802+
LinkDesignVars SymetricLeftHandMarkers_XDIR(DesVar1 =L_HM2_X, DesVar2=L_HM5_X)={};
803+
#endif
804+
#endif
798805

799806

800807

0 commit comments

Comments
 (0)