diff --git a/scaffoldmaker/meshtypes/meshtype_3d_heart1.py b/scaffoldmaker/meshtypes/meshtype_3d_heart1.py index 68102422..1fb3ffe7 100644 --- a/scaffoldmaker/meshtypes/meshtype_3d_heart1.py +++ b/scaffoldmaker/meshtypes/meshtype_3d_heart1.py @@ -28,9 +28,13 @@ def getParameterSetNames(): return [ 'Default', 'Human 1', + 'Mouse 1', 'Pig 1', + 'Rat 1', 'Unit Human 1', - 'Unit Pig 1'] + 'Unit Mouse 1', + 'Unit Pig 1', + 'Unit Rat 1'] @staticmethod def getDefaultOptions(parameterSetName='Default'): diff --git a/scaffoldmaker/meshtypes/meshtype_3d_heartatria1.py b/scaffoldmaker/meshtypes/meshtype_3d_heartatria1.py index f49de58e..922c84b9 100644 --- a/scaffoldmaker/meshtypes/meshtype_3d_heartatria1.py +++ b/scaffoldmaker/meshtypes/meshtype_3d_heartatria1.py @@ -31,9 +31,13 @@ def getParameterSetNames(): return [ 'Default', 'Human 1', + 'Mouse 1', 'Pig 1', + 'Rat 1', 'Unit Human 1', - 'Unit Pig 1'] + 'Unit Mouse 1', + 'Unit Pig 1', + 'Unit Rat 1'] @staticmethod def getDefaultOptions(parameterSetName='Default'): @@ -87,6 +91,18 @@ def getDefaultOptions(parameterSetName='Default'): if 'Human' in parameterSetName: if 'Unit' not in parameterSetName: options['Unit scale'] = 80.0 + elif 'Mouse' in parameterSetName: + if 'Unit' not in parameterSetName: + options['Unit scale'] = 5.0 + options['Number of left pulmonary veins'] = 1 + options['Left pulmonary vein angle up degrees'] = 30.0 + options['Left pulmonary vein inner diameter'] = 0.16 + options['Left pulmonary vein wall thickness'] = 0.011 + options['Right pulmonary vein angle up degrees'] = 10.0 + options['Right pulmonary vein inner diameter'] = 0.15 + options['Right pulmonary vein wall thickness'] = 0.011 + options['Superior vena cava inner diameter'] = 0.17 + options['Superior vena cava wall thickness'] = 0.012 elif 'Pig' in parameterSetName: if 'Unit' not in parameterSetName: options['Unit scale'] = 80.0 @@ -98,6 +114,18 @@ def getDefaultOptions(parameterSetName='Default'): options['Right pulmonary vein wall thickness'] = 0.011 options['Inferior vena cava angle left degrees'] = 50.0 options['Superior vena cava angle up degrees'] = 30.0 + elif 'Rat' in parameterSetName: + if 'Unit' not in parameterSetName: + options['Unit scale'] = 12.0 + options['Number of left pulmonary veins'] = 1 + options['Left pulmonary vein angle up degrees'] = 30.0 + options['Left pulmonary vein inner diameter'] = 0.16 + options['Left pulmonary vein wall thickness'] = 0.011 + options['Right pulmonary vein angle up degrees'] = 10.0 + options['Right pulmonary vein inner diameter'] = 0.15 + options['Right pulmonary vein wall thickness'] = 0.011 + options['Superior vena cava inner diameter'] = 0.17 + options['Superior vena cava wall thickness'] = 0.012 return options @staticmethod diff --git a/scaffoldmaker/meshtypes/meshtype_3d_heartventricles1.py b/scaffoldmaker/meshtypes/meshtype_3d_heartventricles1.py index cec2b386..63b0b45b 100644 --- a/scaffoldmaker/meshtypes/meshtype_3d_heartventricles1.py +++ b/scaffoldmaker/meshtypes/meshtype_3d_heartventricles1.py @@ -33,9 +33,13 @@ def getParameterSetNames(): return [ 'Default', 'Human 1', + 'Mouse 1', 'Pig 1', + 'Rat 1', 'Unit Human 1', - 'Unit Pig 1'] + 'Unit Mouse 1', + 'Unit Pig 1', + 'Unit Rat 1'] @staticmethod def getDefaultOptions(parameterSetName='Default'): @@ -70,6 +74,11 @@ def getDefaultOptions(parameterSetName='Default'): if 'Unit' not in parameterSetName: options['Unit scale'] = 80.0 options['LV outer height'] = 0.9 + elif 'Mouse' in parameterSetName: + if 'Unit' not in parameterSetName: + options['Unit scale'] = 5.0 + options['LV apex thickness'] = 0.08 + options['RV width'] = 0.35 elif 'Pig' in parameterSetName: options['Number of elements up LV apex'] = 2 options['Number of elements up RV'] = 3 @@ -81,6 +90,12 @@ def getDefaultOptions(parameterSetName='Default'): options['RV inner height fraction'] = 0.65 options['RV width growth factor'] = 0.65 options['Ventricular septum thickness'] = 0.12 + elif 'Rat' in parameterSetName: + if 'Unit' not in parameterSetName: + options['Unit scale'] = 12.0 + options['LV outer height'] = 0.9 + options['LV apex thickness'] = 0.08 + options['RV width'] = 0.35 return options @staticmethod diff --git a/scaffoldmaker/meshtypes/meshtype_3d_heartventriclesbase1.py b/scaffoldmaker/meshtypes/meshtype_3d_heartventriclesbase1.py index c5125445..02673916 100644 --- a/scaffoldmaker/meshtypes/meshtype_3d_heartventriclesbase1.py +++ b/scaffoldmaker/meshtypes/meshtype_3d_heartventriclesbase1.py @@ -38,9 +38,13 @@ def getParameterSetNames(): return [ 'Default', 'Human 1', + 'Mouse 1', 'Pig 1', + 'Rat 1', 'Unit Human 1', - 'Unit Pig 1'] + 'Unit Mouse 1', + 'Unit Pig 1', + 'Unit Rat 1'] @staticmethod def getDefaultOptions(parameterSetName='Default'): @@ -76,8 +80,12 @@ def getDefaultOptions(parameterSetName='Default'): options['Ventricles translation y'] = -0.2 if 'Human' in parameterSetName: pass + elif 'Mouse' in parameterSetName: + options['LV outer height'] = 1.0 elif 'Pig' in parameterSetName: options['RV outlet left incline degrees'] = 10.0 + elif 'Rat' in parameterSetName: + pass return options @staticmethod