Merge pull request #80 from opensim-org/femur_furor

Deleted redundant Femur Geometry
opensim-org · Jun 26, 2018 · efb4109 · efb4109
2 parents 554c54e + 0025a6f
commit efb4109
Show file tree

Hide file tree

Showing 32 changed files with 58 additions and 1,900 deletions.
diff --git a/Geometry/femur.vtp b/Geometry/femur.vtp
diff --git a/Models/Gait10dof18musc/gait10dof18musc.osim b/Models/Gait10dof18musc/gait10dof18musc.osim
@@ -329,7 +329,7 @@
 							<objects>
 								<DisplayGeometry>
 									<!--Name of geometry file .vtp, .stl, .obj-->
-									<geometry_file>femur.vtp</geometry_file>
+									<geometry_file>femur_r.vtp</geometry_file>
 									<!--Color used to display the geometry when visible-->
 									<color> 1 1 1</color>
 									<!--Name of texture file .jpg, .bmp-->
@@ -821,7 +821,7 @@
 							<objects>
 								<DisplayGeometry>
 									<!--Name of geometry file .vtp, .stl, .obj-->
-									<geometry_file>l_femur.vtp</geometry_file>
+									<geometry_file>femur_l.vtp</geometry_file>
 									<!--Color used to display the geometry when visible-->
 									<color> 1 1 1</color>
 									<!--Name of texture file .jpg, .bmp-->

diff --git a/Models/Gait10dof18musc/subject01.osim b/Models/Gait10dof18musc/subject01.osim
@@ -334,7 +334,7 @@
 							<objects>
 								<DisplayGeometry>
 									<!--Name of geometry file .vtp, .stl, .obj-->
-									<geometry_file>femur.vtp</geometry_file>
+									<geometry_file>femur_r.vtp</geometry_file>
 									<!--Color used to display the geometry when visible-->
 									<color> 1 1 1</color>
 									<!--Name of texture file .jpg, .bmp-->
@@ -841,7 +841,7 @@
 							<objects>
 								<DisplayGeometry>
 									<!--Name of geometry file .vtp, .stl, .obj-->
-									<geometry_file>l_femur.vtp</geometry_file>
+									<geometry_file>femur_l.vtp</geometry_file>
 									<!--Color used to display the geometry when visible-->
 									<color> 1 1 1</color>
 									<!--Name of texture file .jpg, .bmp-->

diff --git a/Models/Gait10dof18musc/subject01_metabolics.osim b/Models/Gait10dof18musc/subject01_metabolics.osim
@@ -334,7 +334,7 @@
 							<objects>
 								<DisplayGeometry>
 									<!--Name of geometry file .vtp, .stl, .obj-->
-									<geometry_file>femur.vtp</geometry_file>
+									<geometry_file>femur_r.vtp</geometry_file>
 									<!--Color used to display the geometry when visible-->
 									<color> 1 1 1</color>
 									<!--Name of texture file .jpg, .bmp-->
@@ -841,7 +841,7 @@
 							<objects>
 								<DisplayGeometry>
 									<!--Name of geometry file .vtp, .stl, .obj-->
-									<geometry_file>l_femur.vtp</geometry_file>
+									<geometry_file>femur_l.vtp</geometry_file>
 									<!--Color used to display the geometry when visible-->
 									<color> 1 1 1</color>
 									<!--Name of texture file .jpg, .bmp-->

diff --git a/Models/Gait10dof18musc/subject01_metabolics_path_actuator.osim b/Models/Gait10dof18musc/subject01_metabolics_path_actuator.osim
@@ -334,7 +334,7 @@
 							<objects>
 								<DisplayGeometry>
 									<!--Name of geometry file .vtp, .stl, .obj-->
-									<geometry_file>femur.vtp</geometry_file>
+									<geometry_file>femur_r.vtp</geometry_file>
 									<!--Color used to display the geometry when visible-->
 									<color> 1 1 1</color>
 									<!--Name of texture file .jpg, .bmp-->
@@ -841,7 +841,7 @@
 							<objects>
 								<DisplayGeometry>
 									<!--Name of geometry file .vtp, .stl, .obj-->
-									<geometry_file>l_femur.vtp</geometry_file>
+									<geometry_file>femur_l.vtp</geometry_file>
 									<!--Color used to display the geometry when visible-->
 									<color> 1 1 1</color>
 									<!--Name of texture file .jpg, .bmp-->

diff --git a/Models/Gait10dof18musc/subject01_metabolics_path_spring.osim b/Models/Gait10dof18musc/subject01_metabolics_path_spring.osim
@@ -334,7 +334,7 @@
 							<objects>
 								<DisplayGeometry>
 									<!--Name of geometry file .vtp, .stl, .obj-->
-									<geometry_file>femur.vtp</geometry_file>
+									<geometry_file>femur_r.vtp</geometry_file>
 									<!--Color used to display the geometry when visible-->
 									<color> 1 1 1</color>
 									<!--Name of texture file .jpg, .bmp-->
@@ -841,7 +841,7 @@
 							<objects>
 								<DisplayGeometry>
 									<!--Name of geometry file .vtp, .stl, .obj-->
-									<geometry_file>l_femur.vtp</geometry_file>
+									<geometry_file>femur_l.vtp</geometry_file>
 									<!--Color used to display the geometry when visible-->
 									<color> 1 1 1</color>
 									<!--Name of texture file .jpg, .bmp-->

diff --git a/Models/Gait10dof18musc/subject01_metabolics_spring.osim b/Models/Gait10dof18musc/subject01_metabolics_spring.osim
@@ -334,7 +334,7 @@
 							<objects>
 								<DisplayGeometry>
 									<!--Name of geometry file .vtp, .stl, .obj-->
-									<geometry_file>femur.vtp</geometry_file>
+									<geometry_file>femur_r.vtp</geometry_file>
 									<!--Color used to display the geometry when visible-->
 									<color> 1 1 1</color>
 									<!--Name of texture file .jpg, .bmp-->
@@ -841,7 +841,7 @@
 							<objects>
 								<DisplayGeometry>
 									<!--Name of geometry file .vtp, .stl, .obj-->
-									<geometry_file>l_femur.vtp</geometry_file>
+									<geometry_file>femur_l.vtp</geometry_file>
 									<!--Color used to display the geometry when visible-->
 									<color> 1 1 1</color>
 									<!--Name of texture file .jpg, .bmp-->

diff --git a/Models/Gait2354_Simbody/gait2354_simbody.osim b/Models/Gait2354_Simbody/gait2354_simbody.osim
@@ -518,7 +518,7 @@
 							<objects>
 								<DisplayGeometry>
 									<!--Name of geometry file .vtp, .stl, .obj-->
-									<geometry_file>femur.vtp</geometry_file>
+									<geometry_file>femur_r.vtp</geometry_file>
 									<!--Color used to display the geometry when visible-->
 									<color> 1 1 1</color>
 									<!--Name of texture file .jpg, .bmp-->
@@ -1392,7 +1392,7 @@
 							<objects>
 								<DisplayGeometry>
 									<!--Name of geometry file .vtp, .stl, .obj-->
-									<geometry_file>l_femur.vtp</geometry_file>
+									<geometry_file>femur_l.vtp</geometry_file>
 									<!--Color used to display the geometry when visible-->
 									<color> 1 1 1</color>
 									<!--Name of texture file .jpg, .bmp-->

diff --git a/Models/Gait2354_Simbody/subject01_simbody.osim b/Models/Gait2354_Simbody/subject01_simbody.osim
@@ -504,7 +504,7 @@
 							<objects>
 								<DisplayGeometry>
 									<!--Name of geometry file .vtp, .stl, .obj-->
-									<geometry_file>femur.vtp</geometry_file>
+									<geometry_file>femur_r.vtp</geometry_file>
 									<!--Color used to display the geometry when visible-->
 									<color> 1 1 1</color>
 									<!--Name of texture file .jpg, .bmp-->
@@ -1409,7 +1409,7 @@
 							<objects>
 								<DisplayGeometry>
 									<!--Name of geometry file .vtp, .stl, .obj-->
-									<geometry_file>l_femur.vtp</geometry_file>
+									<geometry_file>femur_l.vtp</geometry_file>
 									<!--Color used to display the geometry when visible-->
 									<color> 1 1 1</color>
 									<!--Name of texture file .jpg, .bmp-->

diff --git a/Models/Gait2392_Simbody/gait2392_millard2012muscle.osim b/Models/Gait2392_Simbody/gait2392_millard2012muscle.osim
@@ -504,7 +504,7 @@
 							<objects>
 								<DisplayGeometry>
 									<!--Name of geometry file .vtp, .stl, .obj-->
-									<geometry_file>femur.vtp</geometry_file>
+									<geometry_file>femur_r.vtp</geometry_file>
 									<!--Color used to display the geometry when visible-->
 									<color> 1 1 1</color>
 									<!--Name of texture file .jpg, .bmp-->
@@ -1334,7 +1334,7 @@
 							<objects>
 								<DisplayGeometry>
 									<!--Name of geometry file .vtp, .stl, .obj-->
-									<geometry_file>l_femur.vtp</geometry_file>
+									<geometry_file>femur_l.vtp</geometry_file>
 									<!--Color used to display the geometry when visible-->
 									<color> 1 1 1</color>
 									<!--Name of texture file .jpg, .bmp-->

diff --git a/Models/Gait2392_Simbody/gait2392_thelen2003muscle.osim b/Models/Gait2392_Simbody/gait2392_thelen2003muscle.osim
@@ -504,7 +504,7 @@
 							<objects>
 								<DisplayGeometry>
 									<!--Name of geometry file .vtp, .stl, .obj-->
-									<geometry_file>femur.vtp</geometry_file>
+									<geometry_file>femur_r.vtp</geometry_file>
 									<!--Color used to display the geometry when visible-->
 									<color> 1 1 1</color>
 									<!--Name of texture file .jpg, .bmp-->
@@ -1334,7 +1334,7 @@
 							<objects>
 								<DisplayGeometry>
 									<!--Name of geometry file .vtp, .stl, .obj-->
-									<geometry_file>l_femur.vtp</geometry_file>
+									<geometry_file>femur_l.vtp</geometry_file>
 									<!--Color used to display the geometry when visible-->
 									<color> 1 1 1</color>
 									<!--Name of texture file .jpg, .bmp-->

diff --git a/Models/Gait2392_Simbody/subject01.osim b/Models/Gait2392_Simbody/subject01.osim
@@ -528,7 +528,7 @@
 							<objects>
 								<DisplayGeometry>
 									<!--Name of geometry file .vtp, .stl, .obj-->
-									<geometry_file>femur.vtp</geometry_file>
+									<geometry_file>femur_r.vtp</geometry_file>
 									<!--Color used to display the geometry when visible-->
 									<color> 1 1 1</color>
 									<!--Name of texture file .jpg, .bmp-->
@@ -1477,7 +1477,7 @@
 							<objects>
 								<DisplayGeometry>
 									<!--Name of geometry file .vtp, .stl, .obj-->
-									<geometry_file>l_femur.vtp</geometry_file>
+									<geometry_file>femur_l.vtp</geometry_file>
 									<!--Color used to display the geometry when visible-->
 									<color> 1 1 1</color>
 									<!--Name of texture file .jpg, .bmp-->

diff --git a/Models/Gait2392_Simbody/subject01_adjusted.osim b/Models/Gait2392_Simbody/subject01_adjusted.osim
@@ -528,7 +528,7 @@
 							<objects>
 								<DisplayGeometry>
 									<!--Name of geometry file .vtp, .stl, .obj-->
-									<geometry_file>femur.vtp</geometry_file>
+									<geometry_file>femur_r.vtp</geometry_file>
 									<!--Color used to display the geometry when visible-->
 									<color> 1 1 1</color>
 									<!--Name of texture file .jpg, .bmp-->
@@ -1477,7 +1477,7 @@
 							<objects>
 								<DisplayGeometry>
 									<!--Name of geometry file .vtp, .stl, .obj-->
-									<geometry_file>l_femur.vtp</geometry_file>
+									<geometry_file>femur_l.vtp</geometry_file>
 									<!--Color used to display the geometry when visible-->
 									<color> 1 1 1</color>
 									<!--Name of texture file .jpg, .bmp-->

diff --git a/Models/Gait2392_Simbody/subject01_simbody_adjusted.osim b/Models/Gait2392_Simbody/subject01_simbody_adjusted.osim
@@ -520,7 +520,7 @@
 							<objects>
 								<DisplayGeometry>
 									<!--Name of geometry file .vtp, .stl, .obj-->
-									<geometry_file>femur.vtp</geometry_file>
+									<geometry_file>femur_r.vtp</geometry_file>
 									<!--Color used to display the geometry when visible-->
 									<color> 1 1 1</color>
 									<!--Name of texture file .jpg, .bmp-->
@@ -1425,7 +1425,7 @@
 							<objects>
 								<DisplayGeometry>
 									<!--Name of geometry file .vtp, .stl, .obj-->
-									<geometry_file>l_femur.vtp</geometry_file>
+									<geometry_file>femur_l.vtp</geometry_file>
 									<!--Color used to display the geometry when visible-->
 									<color> 1 1 1</color>
 									<!--Name of texture file .jpg, .bmp-->

diff --git a/Models/Jumper/DynamicJumperModel.osim b/Models/Jumper/DynamicJumperModel.osim
@@ -8714,7 +8714,7 @@ ffor control values-->
 							<objects>
 								<DisplayGeometry name="">
 									<!--Name of geometry file .vtp, .stl, .obj-->
-									<geometry_file> femur.vtp </geometry_file>
+									<geometry_file> femur_r.vtp </geometry_file>
 									<!--Color used to display the geometry when visible-->
 									<color>       1.00000000       1.00000000       1.00000000 </color>
 									<!--Name of texture file .jpg, .bmp-->
@@ -9625,7 +9625,7 @@ ffor control values-->
 							<objects>
 								<DisplayGeometry name="">
 									<!--Name of geometry file .vtp, .stl, .obj-->
-									<geometry_file> l_femur.vtp </geometry_file>
+									<geometry_file> femur_l.vtp </geometry_file>
 									<!--Color used to display the geometry when visible-->
 									<color>       1.00000000       1.00000000       1.00000000 </color>
 									<!--Name of texture file .jpg, .bmp-->

diff --git a/Geometry/l_femur.vtp → Models/RajagopalModel/Geometry/l_femur.vtp b/Geometry/l_femur.vtp → Models/RajagopalModel/Geometry/l_femur.vtp
diff --git a/Geometry/r_femur.vtp → Models/RajagopalModel/Geometry/r_femur.vtp b/Geometry/r_femur.vtp → Models/RajagopalModel/Geometry/r_femur.vtp
diff --git a/Models/ToyLanding/ToyLandingModel.osim b/Models/ToyLanding/ToyLandingModel.osim
@@ -700,7 +700,7 @@
 							<objects>
 								<DisplayGeometry>
 									<!--Name of geometry file .vtp, .stl, .obj-->
-									<geometry_file>femur.vtp</geometry_file>
+									<geometry_file>femur_r.vtp</geometry_file>
 									<!--Color used to display the geometry when visible-->
 									<color> 1 1 1</color>
 									<!--Name of texture file .jpg, .bmp-->
@@ -1574,7 +1574,7 @@
 							<objects>
 								<DisplayGeometry>
 									<!--Name of geometry file .vtp, .stl, .obj-->
-									<geometry_file>l_femur.vtp</geometry_file>
+									<geometry_file>femur_l.vtp</geometry_file>
 									<!--Color used to display the geometry when visible-->
 									<color> 1 1 1</color>
 									<!--Name of texture file .jpg, .bmp-->

diff --git a/Models/ToyLanding/ToyLandingModel_AFO.osim b/Models/ToyLanding/ToyLandingModel_AFO.osim
@@ -700,7 +700,7 @@
 							<objects>
 								<DisplayGeometry>
 									<!--Name of geometry file .vtp, .stl, .obj-->
-									<geometry_file>femur.vtp</geometry_file>
+									<geometry_file>femur_r.vtp</geometry_file>
 									<!--Color used to display the geometry when visible-->
 									<color> 1 1 1</color>
 									<!--Name of texture file .jpg, .bmp-->
@@ -1574,7 +1574,7 @@
 							<objects>
 								<DisplayGeometry>
 									<!--Name of geometry file .vtp, .stl, .obj-->
-									<geometry_file>l_femur.vtp</geometry_file>
+									<geometry_file>femur_l.vtp</geometry_file>
 									<!--Color used to display the geometry when visible-->
 									<color> 1 1 1</color>
 									<!--Name of texture file .jpg, .bmp-->

diff --git a/Models/ToyLanding/ToyLandingModel_activeAFO.osim b/Models/ToyLanding/ToyLandingModel_activeAFO.osim
@@ -700,7 +700,7 @@
 							<objects>
 								<DisplayGeometry>
 									<!--Name of geometry file .vtp, .stl, .obj-->
-									<geometry_file>femur.vtp</geometry_file>
+									<geometry_file>femur_r.vtp</geometry_file>
 									<!--Color used to display the geometry when visible-->
 									<color> 1 1 1</color>
 									<!--Name of texture file .jpg, .bmp-->
@@ -1574,7 +1574,7 @@
 							<objects>
 								<DisplayGeometry>
 									<!--Name of geometry file .vtp, .stl, .obj-->
-									<geometry_file>l_femur.vtp</geometry_file>
+									<geometry_file>femur_l.vtp</geometry_file>
 									<!--Color used to display the geometry when visible-->
 									<color> 1 1 1</color>
 									<!--Name of texture file .jpg, .bmp-->

diff --git a/Pipelines/Gait10dof18musc/OutputReference/CMC/subject01_metabolics.osim b/Pipelines/Gait10dof18musc/OutputReference/CMC/subject01_metabolics.osim
@@ -334,7 +334,7 @@
 							<objects>
 								<DisplayGeometry>
 									<!--Name of geometry file .vtp, .stl, .obj-->
-									<geometry_file>femur.vtp</geometry_file>
+									<geometry_file>femur_r.vtp</geometry_file>
 									<!--Color used to display the geometry when visible-->
 									<color> 1 1 1</color>
 									<!--Name of texture file .jpg, .bmp-->
@@ -841,7 +841,7 @@
 							<objects>
 								<DisplayGeometry>
 									<!--Name of geometry file .vtp, .stl, .obj-->
-									<geometry_file>l_femur.vtp</geometry_file>
+									<geometry_file>femur_l.vtp</geometry_file>
 									<!--Color used to display the geometry when visible-->
 									<color> 1 1 1</color>
 									<!--Name of texture file .jpg, .bmp-->

diff --git a/Pipelines/Gait10dof18musc/OutputReference/CMC/subject01_metabolics_path_actuator.osim b/Pipelines/Gait10dof18musc/OutputReference/CMC/subject01_metabolics_path_actuator.osim
@@ -334,7 +334,7 @@
 							<objects>
 								<DisplayGeometry>
 									<!--Name of geometry file .vtp, .stl, .obj-->
-									<geometry_file>femur.vtp</geometry_file>
+									<geometry_file>femur_r.vtp</geometry_file>
 									<!--Color used to display the geometry when visible-->
 									<color> 1 1 1</color>
 									<!--Name of texture file .jpg, .bmp-->
@@ -841,7 +841,7 @@
 							<objects>
 								<DisplayGeometry>
 									<!--Name of geometry file .vtp, .stl, .obj-->
-									<geometry_file>l_femur.vtp</geometry_file>
+									<geometry_file>femur_l.vtp</geometry_file>
 									<!--Color used to display the geometry when visible-->
 									<color> 1 1 1</color>
 									<!--Name of texture file .jpg, .bmp-->

diff --git a/Pipelines/Gait10dof18musc/OutputReference/CMC/subject01_metabolics_path_spring.osim b/Pipelines/Gait10dof18musc/OutputReference/CMC/subject01_metabolics_path_spring.osim
@@ -334,7 +334,7 @@
 							<objects>
 								<DisplayGeometry>
 									<!--Name of geometry file .vtp, .stl, .obj-->
-									<geometry_file>femur.vtp</geometry_file>
+									<geometry_file>femur_r.vtp</geometry_file>
 									<!--Color used to display the geometry when visible-->
 									<color> 1 1 1</color>
 									<!--Name of texture file .jpg, .bmp-->
@@ -841,7 +841,7 @@
 							<objects>
 								<DisplayGeometry>
 									<!--Name of geometry file .vtp, .stl, .obj-->
-									<geometry_file>l_femur.vtp</geometry_file>
+									<geometry_file>femur_l.vtp</geometry_file>
 									<!--Color used to display the geometry when visible-->
 									<color> 1 1 1</color>
 									<!--Name of texture file .jpg, .bmp-->

diff --git a/Pipelines/Gait10dof18musc/OutputReference/CMC/subject01_metabolics_spring.osim b/Pipelines/Gait10dof18musc/OutputReference/CMC/subject01_metabolics_spring.osim
@@ -334,7 +334,7 @@
 							<objects>
 								<DisplayGeometry>
 									<!--Name of geometry file .vtp, .stl, .obj-->
-									<geometry_file>femur.vtp</geometry_file>
+									<geometry_file>femur_r.vtp</geometry_file>
 									<!--Color used to display the geometry when visible-->
 									<color> 1 1 1</color>
 									<!--Name of texture file .jpg, .bmp-->
@@ -841,7 +841,7 @@
 							<objects>
 								<DisplayGeometry>
 									<!--Name of geometry file .vtp, .stl, .obj-->
-									<geometry_file>l_femur.vtp</geometry_file>
+									<geometry_file>femur_l.vtp</geometry_file>
 									<!--Color used to display the geometry when visible-->
 									<color> 1 1 1</color>
 									<!--Name of texture file .jpg, .bmp-->

diff --git a/Pipelines/Gait10dof18musc/OutputReference/gait10dof18musc.osim b/Pipelines/Gait10dof18musc/OutputReference/gait10dof18musc.osim
@@ -329,7 +329,7 @@
 							<objects>
 								<DisplayGeometry>
 									<!--Name of geometry file .vtp, .stl, .obj-->
-									<geometry_file>femur.vtp</geometry_file>
+									<geometry_file>femur_r.vtp</geometry_file>
 									<!--Color used to display the geometry when visible-->
 									<color> 1 1 1</color>
 									<!--Name of texture file .jpg, .bmp-->
@@ -821,7 +821,7 @@
 							<objects>
 								<DisplayGeometry>
 									<!--Name of geometry file .vtp, .stl, .obj-->
-									<geometry_file>l_femur.vtp</geometry_file>
+									<geometry_file>femur_l.vtp</geometry_file>
 									<!--Color used to display the geometry when visible-->
 									<color> 1 1 1</color>
 									<!--Name of texture file .jpg, .bmp-->