Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
af4ee23
Added missing argument to split segment function
0huitzil Aug 20, 2025
c505fda
Separated arm into branchium and antebrachium
0huitzil Aug 21, 2025
784292b
Separated arm node construction into brachium and antebrachium
0huitzil Aug 28, 2025
caae694
Added body markers, second version of elbow coordinates
0huitzil Oct 1, 2025
33d30c1
Fixed a fold in the shoulder (also removed v2 from elbow nodes)
0huitzil Oct 7, 2025
8f273a6
Fixed a fold in the shoulder (also removed v2 from elbow nodes)
0huitzil Oct 7, 2025
d2fb26f
Merge branch 'stickman' of https://github.com/0huitzil/scaffoldmaker …
0huitzil Oct 7, 2025
74962b6
Rewrote network layourt structure
0huitzil Oct 7, 2025
b2efdd6
Automated the construction of the wholebody network layout.
0huitzil Oct 8, 2025
baf48a3
Added rough elbow coordinates
0huitzil Oct 8, 2025
4c8deb5
Corrected variable name on network layout
0huitzil Oct 8, 2025
6caccca
Updated the construction of the network layout to fix a bug (the top …
0huitzil Oct 8, 2025
f63863d
Fixed another bug with the construction of the network layout
0huitzil Oct 8, 2025
a3af6bc
finishing setup of elbow coordinates
0huitzil Oct 9, 2025
7538b0b
Separated the leg and foot segments in the network layout
0huitzil Oct 9, 2025
13e6d4e
Tweaked elbow width and separated the arm into two segments in the ne…
0huitzil Oct 9, 2025
e9cb318
Added an extra node to the elbow
0huitzil Oct 13, 2025
0b92a40
Separated the 3d annotation groups from the arm
0huitzil Oct 13, 2025
47a23dd
Added an elbow region in the arm
0huitzil Oct 14, 2025
6892bc3
Figured out how to get the right angle at the elbow
0huitzil Oct 14, 2025
af38d2a
Got rid ot the second elbow node, made it part of the antebrachium
0huitzil Oct 15, 2025
b78050d
Fixed the d3 and d2 at the elbow not being orthogonal with a non-zero…
0huitzil Oct 16, 2025
addffb8
Cleaned up elbow rotation code
0huitzil Oct 16, 2025
c815706
Removed elbow from human network layout
0huitzil Oct 16, 2025
407d9ef
Added lower and upper leg annotation groups to the stickman
0huitzil Oct 16, 2025
e23a6af
Added knee rotation
0huitzil Oct 16, 2025
bcd5d31
Got beaten my simple trigonometry
0huitzil Oct 17, 2025
19b92af
Added foot element groups, corrected ankle position and fixed uneven …
0huitzil Oct 20, 2025
321d174
Homogenized the elbow flexion code with the knee and ankle
0huitzil Oct 20, 2025
55af4cc
Fixed the length of the arm+hand
0huitzil Oct 22, 2025
7f12917
Initial shoulder flexion (still needs to be worked on)
0huitzil Oct 22, 2025
aab77f0
Standarized flexion and abduction names
0huitzil Oct 22, 2025
7ded2cf
Cleaned up marker location code in 3d scaffold
0huitzil Oct 22, 2025
721cc35
Separated leg abduction into left and right legs
0huitzil Oct 22, 2025
2977333
Cleaned up comments
0huitzil Oct 22, 2025
209fe33
Removed 1d human network from public scaffold list
0huitzil Oct 22, 2025
a6df895
Removed output from file
0huitzil Oct 22, 2025
a3cb93e
Corrected a numbering error on the elbow node
0huitzil Oct 23, 2025
ac6573a
Updated the elbow code to have elbow node right in the middle
0huitzil Oct 30, 2025
754ad75
Stable version of elbow with minimal bump
0huitzil Oct 30, 2025
85a1316
eliminate the transitionNodes variable
0huitzil Oct 31, 2025
d24cdd3
look good enough here
0huitzil Oct 31, 2025
1b4dc08
Cleaned up code, rotationFactors are standarized
0huitzil Oct 31, 2025
fdc9906
Cleaned up elbow rotation factor and elbow position
0huitzil Nov 2, 2025
9eab8bd
Replicated elbow code at the knee, needs some tweaking still.
0huitzil Nov 3, 2025
00c8c7e
Updated number of elements for leg
0huitzil Nov 3, 2025
cc2ada5
Added initial estimation for ankle flexion (still needs work)
0huitzil Nov 5, 2025
5cd7b33
Added frontal hip flexion
0huitzil Nov 11, 2025
4d2ae1d
Added hip element region
0huitzil Nov 12, 2025
a0f2e69
Added a function containing the directions for joint flexion
0huitzil Nov 19, 2025
2c51671
Updated hip and knee to use the new function to obtain flexion frames
0huitzil Nov 19, 2025
9167bed
Updated foot flexion script
0huitzil Nov 21, 2025
9f259d8
Initial shoulder flexion development
0huitzil Nov 28, 2025
014261b
added arm rotation, shoulder flexion and wrist flexion/deviation
0huitzil Dec 5, 2025
6768fde
changed base arm abudction degrees
0huitzil Dec 7, 2025
15fc165
Merge main branch into stickman
0huitzil Dec 8, 2025
5d9a99f
Merge remote-tracking branch 'origin/main' into stickman
0huitzil Dec 8, 2025
3c60262
Updated wrist directions
0huitzil Dec 8, 2025
f120fbf
Propagated changes to joint rotation to leg and foot
0huitzil Dec 8, 2025
a3bf2d7
Updated tests
0huitzil Dec 11, 2025
fc0a7ae
Added temporary kinematic markers
0huitzil Dec 11, 2025
097538c
Added interactive functions to align to markers
0huitzil Dec 11, 2025
6ead23a
Updated test w/o solid core
0huitzil Dec 11, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 55 additions & 2 deletions src/scaffoldmaker/annotation/body_terms.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,18 @@
("abdominopelvic cavity", "UBERON:0035819"),
("upper limb", "UBERON:0001460"),
("left upper limb", "UBERON:8300002", "FMA:7186"),
("left shoulder", ""),
("left brachium", ""),
("left elbow", ""),
("left antebrachium", ""),
("left hand", ""),
("left upper limb skin epidermis outer surface", "ILX:0796504"),
("right upper limb", "UBERON:8300001", "FMA:7185"),
("right shoulder", ""),
("right brachium", ""),
("right elbow", ""),
("right antebrachium", ""),
("right hand", ""),
("right upper limb skin epidermis outer surface", "ILX:0796503"),
("body", "UBERON:0000468", "ILX:0101370"),
("core", ""),
Expand All @@ -21,11 +31,18 @@
("head core", ""),
("diaphragm", "UBERON:0001103", "ILX:0103194"),
("hand", "ILX:0104885", "FMA:9712"),
("hip", ""),
("left", ""),
("lower limb", "UBERON:0000978"),
("left lower limb", "UBERON:8300004", "FMA:24981"),
("left upper leg", ""),
("left lower leg", ""),
("left foot", ""),
("left lower limb skin epidermis outer surface", "ILX:0796506"),
("right lower limb ", "UBERON:8300003", "FMA:24980"),
("right lower limb", "UBERON:8300003", "FMA:24980"),
("right upper leg", ""),
("right lower leg", ""),
("right foot", ""),
("right lower limb skin epidermis outer surface", "ILX:0796505"),
("foot", "ILX:0745450", "FMA:9664"),
("neck", "UBERON:0000974", "ILX:0733967"),
Expand All @@ -38,7 +55,34 @@
("thoracic cavity", "UBERON:0002224"),
("thoracic cavity boundary surface", "ILX:0796508"),
("thorax", "ILX:0742178"),
("ventral", "")
("ventral", ""),
# kinematic tree markers
('pelvis', ""),
('femur_r', ""),
('tibia_r', ""),
('talus_r', ""),
('calcn_r', ""),
('toes_r', ""),
('femur_l', ""),
('tibia_l', ""),
('talus_l', ""),
('calcn_l', ""),
('toes_l', ""),
('lumbar_body', ""),
('thorax_top', ""),
('head_marker', ""),
('scapula_r', ""),
('humerus_r', ""),
('ulna_r', ""),
('radius_r', ""),
('hand_r', ""),
('scapula_l', ""),
('humerus_l', ""),
('ulna_l', ""),
('radius_l', ""),
('hand_l', ""),


]

def get_body_term(name : str):
Expand All @@ -51,3 +95,12 @@ def get_body_term(name : str):
if name in term:
return ( term[0], term[1] )
raise NameError("Body annotation term '" + name + "' not found.")

def marker_name_in_terms(name: str):
"""
Check if term exists in approved marker terms
"""
for term in body_terms:
if name in term:
return True
return False
Loading