Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
ad4e506
Add renal pelvis scaffold
oneway1225 Dec 15, 2024
0f9b062
Merge branch 'main' into renal-pelvis-scaffold
oneway1225 Dec 15, 2024
cc32301
Fix bending of ureter
oneway1225 Dec 18, 2024
8ac331c
Add methods for user to change the structure of the renal pelvis layout
oneway1225 Jul 21, 2025
669862e
Merge branch 'main' into renal-pelvis-scaffold
oneway1225 Jul 21, 2025
6a4e996
Add checks for number of calyxes
oneway1225 Jul 22, 2025
58e6514
Fix annotation for renal pyramid group
oneway1225 Jul 22, 2025
bb2dddf
Fix core and shell annotations
oneway1225 Jul 23, 2025
341a8a4
Fix generation of core elements for renal pyramids
oneway1225 Jul 23, 2025
d1b26ca
Fix unit test
oneway1225 Jul 27, 2025
bd333a4
Add Rat 1 parameter set
oneway1225 Jul 27, 2025
21ce02b
Merge branch 'main' into renal-pelvis-scaffold
oneway1225 Aug 15, 2025
fc78d58
Merge branch 'main' into renal-pelvis-scaffold
oneway1225 Aug 27, 2025
d780229
Fix 1D layout for renal pyramids and minor calyxes
oneway1225 Sep 21, 2025
45483c5
Update parameters for Human 1
oneway1225 Sep 21, 2025
35855a7
Fix issue with number of minor calyxes
oneway1225 Sep 22, 2025
0e1cb01
Update parameters and add unit test for rat scaffold
oneway1225 Sep 22, 2025
21d2d5c
Fix minor issues and clean up code
oneway1225 Sep 22, 2025
0e358ab
Add ureteropelvic junction width and renal pyramid thickness
oneway1225 Sep 25, 2025
88a5d55
Add refine functionality
oneway1225 Sep 26, 2025
605c691
Fix renal pyramid and minor calyx annotations
oneway1225 Sep 30, 2025
a662266
Add left-right orientation
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
24 changes: 24 additions & 0 deletions src/scaffoldmaker/annotation/kidney_terms.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
"""
Common resource for kidney annotation terms.
"""

# convention: preferred name, preferred id, followed by any other ids and alternative names
kidney_terms = [
("core", ""),
("renal pelvis", "UBERON:0001224", "ILX:0723968"),
("major calyx", "UBERON:0001226", "ILX:0730785"),
("minor calyx", "UBERON:0001227", "ILX:0730473"),
("renal pyramid", "UBERON:0004200", "ILX:0727514"),
("shell", "")
]

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.")
19 changes: 19 additions & 0 deletions src/scaffoldmaker/annotation/ureter_terms.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
"""
Common resource for ureter annotation terms.
"""

# convention: preferred name, preferred id, followed by any other ids and alternative names
ureter_terms = [
("ureter", "UBERON:0000056", "ILX:0728080")
]

def get_ureter_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 ureter_terms:
if name in term:
return (term[0], term[1])
raise NameError("Body annotation term '" + name + "' not found.")
Loading