223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

corrected wrong name in add..., more verbose error checking for geom_from...

This commit is contained in:
Martin Diehl 2015-02-07 22:22:28 +00:00
parent 6140285ddd
commit 7edd209ce4
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
processing/post/addEuclideanDistance.py
View File

@ -96,7 +96,7 @@ parser.add_option('-t','--type', dest = 'type', action = 'extend', type
help = 'feature type (%s) '%(', '.join(map(lambda x:'|'.join(x['names']),features))) ) help = 'feature type (%s) '%(', '.join(map(lambda x:'|'.join(x['names']),features))) )
parser.add_option('-n','--neighborhood', dest='neighborhood', choices = neighborhoods.keys(), metavar = 'string', parser.add_option('-n','--neighborhood', dest='neighborhood', choices = neighborhoods.keys(), metavar = 'string',
help = 'type of neighborhood (%s) [neumann]'%(', '.join(neighborhoods.keys()))) help = 'type of neighborhood (%s) [neumann]'%(', '.join(neighborhoods.keys())))
parser.add_option('-s', '--scale', dest = 'scale', type = 'float', parser.add_option('-s', '--scale', dest = 'scale', type = 'float', metavar='float',
help = 'voxel size [%default]') help = 'voxel size [%default]')
parser.set_defaults(type = []) parser.set_defaults(type = [])
parser.set_defaults(coords = 'ip') parser.set_defaults(coords = 'ip')
@ -107,6 +107,8 @@ parser.set_defaults(scale = 1.0)
(options,filenames) = parser.parse_args() (options,filenames) = parser.parse_args()
if len(options.type) == 0: parser.error('please select a feature type') if len(options.type) == 0: parser.error('please select a feature type')
if not set(options.type).issubset(set(map(lambda x: x['name'],features))):
parser.error('type must be chosen from (%s)...'%(', '.join(map(lambda x:', '.join([x['name']]),features))))
if 'biplane' in options.type and 'boundary' in options.type: if 'biplane' in options.type and 'boundary' in options.type:
parser.error("please select only one alias for 'biplane' and 'boundary'") parser.error("please select only one alias for 'biplane' and 'boundary'")
@ -144,7 +146,7 @@ for file in files:
# ------------------------------------------ assemble header --------------------------------------- # ------------------------------------------ assemble header ---------------------------------------
for feature in feature_list: for feature in feature_list:
table.labels_append('ED_%s(%s)'%(features[feature]['names'],options.id)) # extend ASCII header with new labels table.labels_append('ED_%s(%s)'%(features[feature]['names'][0],options.id)) # extend ASCII header with new labels
table.head_write() table.head_write()

5
processing/pre/geom_fromEuclideanDistance.py
View File

@ -114,6 +114,11 @@ parser.set_defaults(scale = 1.0)
(options,filenames) = parser.parse_args() (options,filenames) = parser.parse_args()
if len(options.type) == 0: parser.error('please select a feature type')
if not set(options.type).issubset(set(map(lambda x: x['name'],features))):
parser.error('type must be chosen from (%s)...'%(', '.join(map(lambda x:', '.join([x['name']]),features))))
if 'biplane' in options.type and 'boundary' in options.type:
parser.error("please select only one alias for 'biplane' and 'boundary'")
feature_list = [] feature_list = []
for i,feature in enumerate(features): for i,feature in enumerate(features):