Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
4a4a4dd
Add cap mesh
oneway1225 Nov 6, 2024
9ee7a9d
Fix triple point box transition EFT
oneway1225 Nov 13, 2024
428c308
Fix mismatched scalefactors between the tube mesh and the cap mesh
oneway1225 Nov 15, 2024
8375dea
Refactor code
oneway1225 Nov 21, 2024
6d64fe2
Remove unused scaffold imports in scaffolds file
oneway1225 Nov 22, 2024
f36f7d3
Merge branch 'ABI-Software:main' into cap-mesh
oneway1225 Dec 15, 2024
6691f8f
Add renal capsule scaffold
oneway1225 Dec 19, 2024
05cec39
Merge branch 'main' into cap-mesh
oneway1225 Jun 15, 2025
733a6d5
Update checkOptions
oneway1225 Jun 15, 2025
63dc46c
Add getLayoutStructure to 1D Renal Capsule Network
oneway1225 Jun 15, 2025
a855a35
Update unit test
oneway1225 Jun 16, 2025
ae26279
Update checkOptions for 1D Renal Capsule Network
oneway1225 Jun 16, 2025
db7aea6
Add annotations to the cap mesh
oneway1225 Jul 15, 2025
2bf888d
Replace renal capsule to kidney capsule in kidney terms
oneway1225 Jul 15, 2025
88a47cc
Update unit test for renal capsule scaffold
oneway1225 Jul 15, 2025
cca6e03
Update unit test for cap mesh
oneway1225 Jul 15, 2025
d8e9864
Improve derivatives at cap-tube joint
oneway1225 Jul 17, 2025
f1dbf2b
Improve smoothing of cap shell layer
oneway1225 Jul 20, 2025
a5d968d
Fix mesh alignment between tube body and end caps
oneway1225 Jul 20, 2025
f3e197d
Fix calculation of apex coordinates for cap without core
oneway1225 Jul 21, 2025
df3b121
Update unit tests for cap mesh and renal capsule scaffold
oneway1225 Jul 21, 2025
ea1a721
Replace math.cbrt with math.pow
oneway1225 Jul 21, 2025
2f193e6
Merge branch 'main' into cap-mesh
oneway1225 Aug 17, 2025
908d0f6
Resolve merge conflicts when merging main
oneway1225 Aug 17, 2025
878594d
Replace cap without core case to use cap with core without box elements
oneway1225 Aug 20, 2025
6b48f65
Merge branch 'main' into cap-mesh
oneway1225 Aug 20, 2025
07d9fcb
Fix issue with 2D tube network
oneway1225 Aug 20, 2025
bb89342
Refactor isCap and isPatch code in networkmesh
oneway1225 Aug 20, 2025
aafbb7c
Fix issue with cap transition elements
oneway1225 Aug 26, 2025
bf07185
Merge branch 'main' into cap-mesh
oneway1225 Aug 26, 2025
15f497a
Fix issue with unit test for renal capsule scaffold
oneway1225 Aug 27, 2025
9d0f2fb
Refactor node layouts in eft_utils
oneway1225 Aug 27, 2025
6717a25
Add annotations to the kidney scaffold
oneway1225 Sep 8, 2025
b6067f8
Rename Renal Capsule scaffold to Kidney scaffold
oneway1225 Sep 8, 2025
826cd0b
Update parameters for kidney dimensions
oneway1225 Sep 9, 2025
594b161
Add left and right kidneys
oneway1225 Sep 11, 2025
3538c76
Update annotations for left and right kidneys
oneway1225 Sep 16, 2025
13e131e
Update unit test
oneway1225 Sep 16, 2025
4a030e9
Add point markers
oneway1225 Oct 30, 2025
0d4cb0a
Remove redundant function in networkmesh
oneway1225 Oct 30, 2025
32cd4ab
Fix wrong option names
oneway1225 Nov 9, 2025
ff5deae
Add a function for bending the kidney mesh
oneway1225 Nov 13, 2025
5ee3103
Remove kidney spacing option in the 1D layout
oneway1225 Nov 13, 2025
fe7b034
Remove unused options in 1D layout
oneway1225 Nov 13, 2025
84fc3f8
Fix kidney orientation
oneway1225 Nov 13, 2025
55ab34a
Change number of elements through shell to cortex
oneway1225 Nov 13, 2025
38ec23c
Update unit test
oneway1225 Nov 14, 2025
491ef87
Merge branch 'main' into cap-mesh
oneway1225 Nov 17, 2025
ea241f3
Clean up code and method descriptions
oneway1225 Nov 17, 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
73 changes: 73 additions & 0 deletions src/scaffoldmaker/annotation/kidney_terms.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
"""
Common resource for kidney annotation terms.
"""

# convention: preferred name, preferred id, followed by any other ids and alternative names
kidney_terms = [
("anterior surface of kidney", "UBERON:0035368", "ILX:0724840"),
("anterior surface of left kidney", ""),
("anterior surface of right kidney", ""),
("cortex of kidney", "UBERON:0001225", "ILX:0726853"),
("cortex of left kidney", "ILX:0791219"),
("cortex of right kidney", "ILX:0791182"),
("dorsal surface of kidney", ""),
("dorsal surface of left kidney", ""),
("dorsal surface of right kidney", ""),
("hilum of kidney", "UBERON:0008716", "ILX:0731719"),
("hilum of left kidney", ""),
("hilum of right kidney", ""),
("inferior pole of left kidney", "FMA:15609"),
("inferior pole of right kidney", "FMA:15608"),
("inner medulla of left kidney", "ILX:0784932"),
("inner medulla of right kidney", "ILX:0791193"),
("juxtamedullary cortex", "UBERON:0005271", "ILX:0730126"),
("juxtamedullary cortex surface of kidney", ""),
("juxtamedullary cortex surface of left kidney", ""),
("juxtamedullary cortex surface of right kidney", ""),
("kidney", "UBERON:0002113", "ILX:0735723"),
("kidney capsule", "UBERON:0002015", "ILX:0733912"),
("lateral edge of kidney", ""),
("lateral edge of left kidney", ""),
("lateral edge of right kidney", ""),
("lateral surface of kidney", ""),
("lateral surface of left kidney", ""),
("lateral surface of right kidney", ""),
("left kidney", "UBERON:0004538", "ILX:0725163"),
("left kidney capsule", ""),
("major calyx", "UBERON:0001226", "ILX:0730785"),
("medial edge of kidney", ""),
("medial edge of left kidney", ""),
("medial edge of right kidney", ""),
("medial surface of kidney", ""),
("medial surface of left kidney", ""),
("medial surface of right kidney", ""),
("medulla of left kidney", ""),
("medulla of right kidney", ""),
("minor calyx", "UBERON:0001227", "ILX:0730473"),
("outer medulla of left kidney", ""),
("outer medulla of right kidney", ""),
("renal medulla", "UBERON:0000362", "ILX:0729114"),
("renal pelvis", "UBERON:0001224", "ILX:0723968"),
("renal pyramid", "UBERON:0004200", "ILX:0727514"),
("right kidney", "UBERON:0004539", "ILX:0735697"),
("right kidney capsule", ""),
("posterior surface of kidney", "UBERON:0035471", "ILX:0724479"),
("posterior surface of left kidney", ""),
("posterior surface of right kidney", ""),
("superior pole of left kidney", "FMA:15607"),
("superior pole of right kidney", "FMA:15606"),
("ventral surface of kidney", ""),
("ventral surface of left kidney", ""),
("ventral surface of right kidney", "")
]

def get_kidney_term(name : str):
"""
Find term by matching name to any identifier held for a term.
Raise exception if name not found.
:return ( preferred name, preferred id )
"""
for term in kidney_terms:
if name in term:
return (term[0], term[1])
raise NameError("Kidney annotation term '" + name + "' not found.")
Loading