X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/myo-class.git/blobdiff_plain/1d3fb87f139a53b55ceb52f3dc2db49ac2b0a0ac..d983932e5a974928a10bbab7e86fdf3e162ae2ae:/totraindir.py

diff --git a/totraindir.py b/totraindir.py
index 8d90c14..1fbaf08 100644
--- a/totraindir.py
+++ b/totraindir.py
@@ -4,8 +4,8 @@ import pydicom
 from os.path import join
 
 # locals
-from topng import topng
-from regularjson import search, RT_PATH, JSON_GTS, INFA_STR
+from topng import topng, mask
+from regularjson import search, RT_PATH, JSON_GTS, INFA_STR, EPI_STR
 
 # constants
 GLOB_DIR = '../../Data/Images_anonymous/'
@@ -68,15 +68,10 @@ if __name__ == '__main__':
 				ref = join(r, l2[i]) # logically, should be the json ref of i dicom image
 
 				infarctus = search(ref, INFA_STR)
-				if infarctus:
-					# print("infarctus:", infarctus) # Testing..
-					# topng(join(caspath, dic), '%/%-%' % (join(OUT_DIR, 'infarctus'), cas, dic)
-					# print(join(caspath, dic), '{}/{}-{}'.format(join(OUT_DIR, 'infarctus'), cas, dic)) # Testing..
-					w, h = topng(join(caspath, dic), '{}/{}-{}'.format(join(OUT_DIR, 'infarctus'), cas, dic))
-				else:
-					# print("no infarctus:", infarctus) # Testing..
-					# print(join(caspath, dic), '{}/{}-{}'.format(join(OUT_DIR, 'noinfarctus'), cas, dic)) # Testing..
-					w, h = topng(join(caspath, dic), '{}/{}-{}'.format(join(OUT_DIR, 'noinfarctus'), cas, dic))
+				# epimask = mask(ref, EPI_STR)
+				# print("infarctus:", infarctus) # Testing..
+				# topng(join(caspath, dic), '%/%-%' % (join(OUT_DIR, 'infarctus'), cas, dic)
+				w, h = topng(join(caspath, dic), '{}/{}-{}'.format(join(OUT_DIR, 'infarctus' if infarctus else 'noinfarctus'), cas, dic))
 
 				# search maximums
 				if wmax < w: wmax = w