Skip to content

Commit

Permalink
Fix naming of Obliq internals
Browse files Browse the repository at this point in the history
  • Loading branch information
hs committed Oct 24, 2024
1 parent 520a0e9 commit 599da98
Show file tree
Hide file tree
Showing 5 changed files with 226 additions and 228 deletions.
157 changes: 78 additions & 79 deletions Body/AAUHuman/Trunk/MusclesLeft.any
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3872,16 +3872,13 @@ AnyMuscleShortestPath OIC_7 = {

AnyMuscleShortestPath OIC_8 = {
AnyMuscleModel &MusMdl = ....MuscleModels.Left.ObliquusInternus.OIC_8;
AnyRefNode &Org = ....Segments.SternalBodySeg.Xiphoid_DiaphragmNodeL;
AnyRefNode &Via = Main.HumanModel.BodyModel.Trunk.Abdominal.Layer_L1.BaseSegAnterior.TransversusPoints.Left.nn06;
AnyRefNode &Org = ....Segments.SternalBodySeg.RACP_Via_2_L;
// AnyRefNode &Via = Main.HumanModel.BodyModel.Trunk.Abdominal.Layer_L1.BaseSegAnterior.TransversusPoints.Left.nn05;

AnyRefNode &Ins = ....Segments.PelvisSeg.Left.ObliquusInternusNode_6;

//AnySurfTriCylMesh &mesh2 = Main.HumanModel.BodyModel.Trunk.Abdominal.Layer_L2.BaseSegAnterior.mesh;
//AnySurfTriCylMesh &mesh3 = Main.HumanModel.BodyModel.Trunk.Abdominal.Layer_L3.BaseSegAnterior.mesh;
//AnySurfTriCylMesh &mesh4 = Main.HumanModel.BodyModel.Trunk.Abdominal.Layer_L4.BaseSegAnterior.mesh;
// AnySurfTriCylMesh &mesh5 = Main.HumanModel.BodyModel.Trunk.Abdominal.Layer_L5.BaseSegAnterior.mesh;

//// AnySurfTriCylMesh &mesh2 = Main.HumanModel.BodyModel.Trunk.Abdominal.Layer_L2.BaseSegAnterior.mesh;
//// AnySurfTriCylMesh &mesh3 = Main.HumanModel.BodyModel.Trunk.Abdominal.Layer_L3.BaseSegAnterior.mesh;
//// AnySurfTriCylMesh &mesh4 = Main.HumanModel.BodyModel.Trunk.Abdominal.Layer_L4.BaseSegAnterior.mesh;
// #if MESH_TYPE == "ELLIPSOID_SIDE"
// AnySurfEllipsoid &mesh2 = Main.HumanModel.BodyModel.Trunk.Abdominal.Layer_L2.BaseSegAnterior.Left.mesh;
// AnySurfEllipsoid &mesh3 = Main.HumanModel.BodyModel.Trunk.Abdominal.Layer_L3.BaseSegAnterior.Left.mesh;
Expand All @@ -3892,23 +3889,24 @@ AnyMuscleShortestPath OIC_8 = {
// AnySurfTriCylMesh &mesh4 = Main.HumanModel.BodyModel.Trunk.Abdominal.Layer_L4.BaseSegAnterior.mesh;
// #endif

// AnySurfEllipsoid &mesh1 = Main.HumanModel.BodyModel.Trunk.Abdominal.Layer_L1.BaseSegAnterior.mesh3;
// AnySurfEllipsoid &mesh2 = Main.HumanModel.BodyModel.Trunk.Abdominal.Layer_L2.BaseSegAnterior.mesh3;
AnySurfEllipsoid &mesh3 = Main.HumanModel.BodyModel.Trunk.Abdominal.Layer_L3.BaseSegAnterior.mesh3;
AnySurfEllipsoid &mesh4 = Main.HumanModel.BodyModel.Trunk.Abdominal.Layer_L4.BaseSegAnterior.mesh3;


SPLine.StringMesh=240;

SPLine.StringMesh=240;

SPLine ={
// StringSurfaceMap={{Off,Off,Off},{On,On,On}}; //no wrap before after via
StringSurfaceMap={{Off,Off},{On,On}}; //no wrap before after via
SPLine ={
// SolverVersion=3;
// StringSurfaceMap={{Off,Off,Off,Off},{On,On,On,On}}; //no wrap before after via

// #if MESH_TYPE == "ELLIPSOID"

// #if MESH_TYPE == "ELLIPSOID"
// AnyMatrix InitWrapPos = {
// transf3D({.mesh2.Radius[0],0,0}, &.mesh2),
// transf3D({.mesh3.Radius[0],0,0}, &.mesh3),
// transf3D({.mesh4.Radius[0],0,0}, &.mesh4),
// // transf3D({.mesh5.Radius[0],0,0}, &.mesh5),
// };
// #endif
// #if MESH_TYPE == "ELLIPSOID_SIDE"
Expand All @@ -3918,38 +3916,51 @@ AnyMuscleShortestPath OIC_8 = {
// transf3D({0,.mesh4.Radius[1],0}, &.mesh4),
// };
// #endif
//
// #if MESH_TYPE == "QUAD"
// AnyMatrix InitWrapPos = {
// transf3D(.mesh2.Points[floor(.mesh2.MeshSize*0.8)+2*.mesh2.MeshSize*6]+{0.02,0,0}, &.mesh2),
// transf3D(.mesh3.Points[floor(.mesh3.MeshSize*0.7)+2*.mesh3.MeshSize*6]+{0.02,0,0}, &.mesh3),
// transf3D(.mesh4.Points[floor(.mesh4.MeshSize*0.6)+2*.mesh4.MeshSize*6]+{0.02,0,0}, &.mesh4),
// // transf3D(.mesh5.Points[floor(.mesh5.MeshSize*0.6)+2*.mesh5.MeshSize*6]+{0.02,0,0}, &.mesh5)
// };
//
// AnyMatrix InitWrapPos = {
// // transf3D({0.0,2*.srf1.MajorRadius,-.srf1.MajorRadius}, &.srf1),
// // transf3D(.mesh1.Points[52]+{0.03,0,0}, &.mesh1),
// // transf3D(.mesh1.Points[floor(.mesh2.MeshSize*0.8)+2*.mesh2.MeshSize*4]+{0.01,0,0}, &.mesh1),
// transf3D(.mesh2.Points[floor(.mesh2.MeshSize*0.75)+2*.mesh2.MeshSize*6]+{0.02,0,0}, &.mesh2),
// transf3D(.mesh3.Points[floor(.mesh3.MeshSize*0.7)+2*.mesh3.MeshSize*6]+{0.02,0,0}, &.mesh3),
// transf3D(.mesh4.Points[floor(.mesh4.MeshSize*0.65)+2*.mesh4.MeshSize*6]+{0.02,0,0}, &.mesh4),
//// transf3D(mesh.Points[floor(.mesh.MeshSize*4]+{0.01,0,0}, &.mesh),
//
// // transf3D(.mesh5.Points[floor(.mesh5.MeshSize*0.65)+2*.mesh5.MeshSize*6]+{0.02,0,0}, &.mesh5)
// };
//
// #endif
AnyMatrix InitWrapPos = {

AnyMatrix InitWrapPos = {
// transf3D({.mesh1.Radius[0],0,0}, &.mesh1),
// transf3D({.mesh2.Radius[0],0,0}, &.mesh2),
transf3D({.mesh3.Radius[0],0,0}, &.mesh3),
transf3D({.mesh4.Radius[0],0,0}, &.mesh4),
// transf3D({.mesh5.Radius[0],0,0}, &.mesh5),
};

InitWrapPosVecArr = {None,&InitWrapPos};
};
viewMuscle = {#include "../DrawSettings/MusDrawSettings.any"};
viewForce.Visible ??= Off;

InitWrapPosVecArr = {&InitWrapPos};
//InitWrapPosVecArr = {&InitWrapPos};


};
viewMuscle = {#include "../DrawSettings/MusDrawSettings.any"};
viewForce.Visible ??= Off;
};

AnyMuscleShortestPath OIC_8_extra = {
AnyMuscleModel &MusMdl = ....MuscleModels.Left.ObliquusInternus.OIC_8_extra;
AnyRefNode &Org = ....Segments.SternalBodySeg.RACP_Via_2_L;
// AnyRefNode &Via = Main.HumanModel.BodyModel.Trunk.Abdominal.Layer_L1.BaseSegAnterior.TransversusPoints.Left.nn05;
AnyMuscleShortestPath OIC_9 = {
AnyMuscleModel &MusMdl = ....MuscleModels.Left.ObliquusInternus.OIC_9;
AnyRefNode &Org = ....Segments.SternalBodySeg.Xiphoid_DiaphragmNodeL;
AnyRefNode &Via = Main.HumanModel.BodyModel.Trunk.Abdominal.Layer_L1.BaseSegAnterior.TransversusPoints.Left.nn06;

AnyRefNode &Ins = ....Segments.PelvisSeg.Left.ObliquusInternusNode_6;
//// AnySurfTriCylMesh &mesh2 = Main.HumanModel.BodyModel.Trunk.Abdominal.Layer_L2.BaseSegAnterior.mesh;
//// AnySurfTriCylMesh &mesh3 = Main.HumanModel.BodyModel.Trunk.Abdominal.Layer_L3.BaseSegAnterior.mesh;
//// AnySurfTriCylMesh &mesh4 = Main.HumanModel.BodyModel.Trunk.Abdominal.Layer_L4.BaseSegAnterior.mesh;

//AnySurfTriCylMesh &mesh2 = Main.HumanModel.BodyModel.Trunk.Abdominal.Layer_L2.BaseSegAnterior.mesh;
//AnySurfTriCylMesh &mesh3 = Main.HumanModel.BodyModel.Trunk.Abdominal.Layer_L3.BaseSegAnterior.mesh;
//AnySurfTriCylMesh &mesh4 = Main.HumanModel.BodyModel.Trunk.Abdominal.Layer_L4.BaseSegAnterior.mesh;
// AnySurfTriCylMesh &mesh5 = Main.HumanModel.BodyModel.Trunk.Abdominal.Layer_L5.BaseSegAnterior.mesh;

// #if MESH_TYPE == "ELLIPSOID_SIDE"
// AnySurfEllipsoid &mesh2 = Main.HumanModel.BodyModel.Trunk.Abdominal.Layer_L2.BaseSegAnterior.Left.mesh;
// AnySurfEllipsoid &mesh3 = Main.HumanModel.BodyModel.Trunk.Abdominal.Layer_L3.BaseSegAnterior.Left.mesh;
Expand All @@ -3960,24 +3971,23 @@ AnyMuscleShortestPath OIC_8_extra = {
// AnySurfTriCylMesh &mesh4 = Main.HumanModel.BodyModel.Trunk.Abdominal.Layer_L4.BaseSegAnterior.mesh;
// #endif

// AnySurfEllipsoid &mesh1 = Main.HumanModel.BodyModel.Trunk.Abdominal.Layer_L1.BaseSegAnterior.mesh3;
// AnySurfEllipsoid &mesh2 = Main.HumanModel.BodyModel.Trunk.Abdominal.Layer_L2.BaseSegAnterior.mesh3;
AnySurfEllipsoid &mesh3 = Main.HumanModel.BodyModel.Trunk.Abdominal.Layer_L3.BaseSegAnterior.mesh3;
AnySurfEllipsoid &mesh4 = Main.HumanModel.BodyModel.Trunk.Abdominal.Layer_L4.BaseSegAnterior.mesh3;


SPLine.StringMesh=240;

SPLine ={
// SolverVersion=3;
// StringSurfaceMap={{Off,Off,Off,Off},{On,On,On,On}}; //no wrap before after via

SPLine.StringMesh=240;

// #if MESH_TYPE == "ELLIPSOID"
SPLine ={
// StringSurfaceMap={{Off,Off,Off},{On,On,On}}; //no wrap before after via
StringSurfaceMap={{Off,Off},{On,On}}; //no wrap before after via

// #if MESH_TYPE == "ELLIPSOID"
// AnyMatrix InitWrapPos = {
// transf3D({.mesh2.Radius[0],0,0}, &.mesh2),
// transf3D({.mesh3.Radius[0],0,0}, &.mesh3),
// transf3D({.mesh4.Radius[0],0,0}, &.mesh4),
// // transf3D({.mesh5.Radius[0],0,0}, &.mesh5),
// };
// #endif
// #if MESH_TYPE == "ELLIPSOID_SIDE"
Expand All @@ -3987,42 +3997,31 @@ SPLine ={
// transf3D({0,.mesh4.Radius[1],0}, &.mesh4),
// };
// #endif

// #if MESH_TYPE == "QUAD"
// AnyMatrix InitWrapPos = {
// // transf3D({0.0,2*.srf1.MajorRadius,-.srf1.MajorRadius}, &.srf1),
// // transf3D(.mesh1.Points[52]+{0.03,0,0}, &.mesh1),
// // transf3D(.mesh1.Points[floor(.mesh2.MeshSize*0.8)+2*.mesh2.MeshSize*4]+{0.01,0,0}, &.mesh1),
// transf3D(.mesh2.Points[floor(.mesh2.MeshSize*0.75)+2*.mesh2.MeshSize*6]+{0.02,0,0}, &.mesh2),
// transf3D(.mesh3.Points[floor(.mesh3.MeshSize*0.7)+2*.mesh3.MeshSize*6]+{0.02,0,0}, &.mesh3),
// transf3D(.mesh4.Points[floor(.mesh4.MeshSize*0.65)+2*.mesh4.MeshSize*6]+{0.02,0,0}, &.mesh4),
//// transf3D(mesh.Points[floor(.mesh.MeshSize*4]+{0.01,0,0}, &.mesh),
//
// // transf3D(.mesh5.Points[floor(.mesh5.MeshSize*0.65)+2*.mesh5.MeshSize*6]+{0.02,0,0}, &.mesh5)
// };
//
// #if MESH_TYPE == "QUAD"
// AnyMatrix InitWrapPos = {
// transf3D(.mesh2.Points[floor(.mesh2.MeshSize*0.8)+2*.mesh2.MeshSize*6]+{0.02,0,0}, &.mesh2),
// transf3D(.mesh3.Points[floor(.mesh3.MeshSize*0.7)+2*.mesh3.MeshSize*6]+{0.02,0,0}, &.mesh3),
// transf3D(.mesh4.Points[floor(.mesh4.MeshSize*0.6)+2*.mesh4.MeshSize*6]+{0.02,0,0}, &.mesh4),
// // transf3D(.mesh5.Points[floor(.mesh5.MeshSize*0.6)+2*.mesh5.MeshSize*6]+{0.02,0,0}, &.mesh5)
// };
//
// #endif

AnyMatrix InitWrapPos = {
// transf3D({.mesh1.Radius[0],0,0}, &.mesh1),
AnyMatrix InitWrapPos = {
// transf3D({.mesh2.Radius[0],0,0}, &.mesh2),
transf3D({.mesh3.Radius[0],0,0}, &.mesh3),
transf3D({.mesh4.Radius[0],0,0}, &.mesh4),
// transf3D({.mesh5.Radius[0],0,0}, &.mesh5),
};


InitWrapPosVecArr = {&InitWrapPos};
//InitWrapPosVecArr = {&InitWrapPos};


};
viewMuscle = {#include "../DrawSettings/MusDrawSettings.any"};
viewForce.Visible ??= Off;
InitWrapPosVecArr = {None,&InitWrapPos};
};
viewMuscle = {#include "../DrawSettings/MusDrawSettings.any"};
viewForce.Visible ??= Off;
};


AnyMuscleShortestPath OIC_9 = {
AnyMuscleModel &MusMdl = ....MuscleModels.Left.ObliquusInternus.OIC_9;
AnyMuscleShortestPath OIC_10 = {
AnyMuscleModel &MusMdl = ....MuscleModels.Left.ObliquusInternus.OIC_10;
AnyRefNode &Org = ....Abdominal.Layer_L1.BaseSegAnterior.mid;
AnyRefNode &Ins = ....Segments.PelvisSeg.Left.ObliquusInternusNode_6;

Expand Down Expand Up @@ -4099,8 +4098,8 @@ AnyMuscleShortestPath OIC_9 = {
};


AnyMuscleShortestPath OIC_10 = {
AnyMuscleModel &MusMdl = ....MuscleModels.Left.ObliquusInternus.OIC_10;
AnyMuscleShortestPath OIC_11 = {
AnyMuscleModel &MusMdl = ....MuscleModels.Left.ObliquusInternus.OIC_11;
AnyRefNode &Org = ....Abdominal.Layer_L2.BaseSegAnterior.mid;
AnyRefNode &Ins = ....Segments.PelvisSeg.Left.ObliquusInternusNode_6;

Expand Down Expand Up @@ -4183,8 +4182,8 @@ AnyMuscleShortestPath OIC_10 = {

//

AnyMuscleShortestPath OIC_11 = {
AnyMuscleModel &MusMdl = ....MuscleModels.Left.ObliquusInternus.OIC_11;
AnyMuscleShortestPath OIC_12 = {
AnyMuscleModel &MusMdl = ....MuscleModels.Left.ObliquusInternus.OIC_12;
AnyRefNode &Org = ....Abdominal.Layer_L3.BaseSegAnterior.mid;
AnyRefNode &Ins = ....Segments.PelvisSeg.Left.ObliquusInternusNode_7;

Expand Down Expand Up @@ -4252,8 +4251,8 @@ AnyMuscleShortestPath OIC_11 = {
};


AnyMuscleShortestPath OIC_12 = {
AnyMuscleModel &MusMdl = ....MuscleModels.Left.ObliquusInternus.OIC_12;
AnyMuscleShortestPath OIC_13 = {
AnyMuscleModel &MusMdl = ....MuscleModels.Left.ObliquusInternus.OIC_13;
AnyRefNode &Org = ....Abdominal.Layer_L4.BaseSegAnterior.mid;
AnyRefNode &Ins = ....Segments.PelvisSeg.Left.ObliquusInternusNode_7;

Expand Down Expand Up @@ -4307,8 +4306,8 @@ AnyMuscleShortestPath OIC_12 = {
viewForce.Visible ??= Off;
};

AnyMuscleViaPoint OIC_13= {
AnyMuscleModel &MusMdl = ....MuscleModels.Left.ObliquusInternus.OIC_13;
AnyMuscleViaPoint OIC_14= {
AnyMuscleModel &MusMdl = ....MuscleModels.Left.ObliquusInternus.OIC_14;
AnyRefNode &Org = ....Abdominal.Layer_L5.BaseSegAnterior.mid;
AnyRefNode &Ins = ....Segments.PelvisSeg.Left.ObliquusInternusNode_8;

Expand Down
Loading

0 comments on commit 599da98

Please sign in to comment.