not longer as dirty, working!, more white-list-tags

General Bison · General Bison · commit e1f8c19969e3 · 2014-05-25T22:01:38.000+02:00
diff --git a/core.py b/core.py
@@ -24,7 +24,7 @@
 
 import os
 import dicom
-
+import random
 
 def isDicom(fullpath):
 	"""
@@ -114,24 +114,44 @@ def anonymize_byWhitelist(whitelist, filename, newfilename):
 	for ar in whitelist:
 		for subAr in ar:
 			nwhitelist.append(str(subAr).replace("'", ''))
+	#print nwhitelist
 
 	# Load the current dicom file to get tag- and valuelist
 	dataset = dicom.read_file(filename)
 
 	# write delete nonwhitelist tag values into datalist
 	#dataset.walk(tagbased_callback)
 
-	for dt in dataset.keys():
+	for dt in dataset:
 		#print type(dt)
-		if str(dt) in nwhitelist:
+		#print dt, dt.__dict__
+		#print dt.tag
+		if str(dt.tag) in nwhitelist:
 			pass
 			#print 'keep:', str(dt)
 			#print dataset[dt]
+			#insatnce number
+			#series number
 		else:
-			print 'del:', str(dt), '|', dataset[dt].value
-			dataset[dt].value = ''
-			print dataset[dt]
-
+			if 'value' in dt.__dict__:
+				print 'del:', dt
+				print 'val:', dataset.value
+				dataset.value = ''
+			else:
+				print 'hard reset:', dt
+				tmpType = type(dt._value)
+				if tmpType is str:
+					dt._value = ''
+				elif tmpType is int or tmpType is float:
+					dt._value = 0
+				elif tmpType is list:
+					dt._value = []
+				elif str(tmpType) == "<class 'dicom.UID.UID'>":
+					dt._value = "0"
+					#print 'UID cant be reset', tmpType
+				else:
+					print 'unknown type:', '#'+str(tmpType)+'#'
+					dt._value = ""
 	#for whitelisttag in whitelist:
 	#    if str(data_element.tag) != str(whitelisttag):
 	 #       cnt+=1
diff --git a/lists/tags_to_hold/tags_hold_always.txt b/lists/tags_to_hold/tags_hold_always.txt
@@ -10,8 +10,9 @@
 0020,0020	patient orientation
 0020,0032	image position
 0020,0037	image orientation
-0020,ff
-0028,ff
+#0020,ff
+#0028,ff
+
 # forgotten!
 0028,0102	High Bit
 7fe0,0010	Pixel Data
@@ -32,10 +33,17 @@
 0028,0000	Group Length
 0020,0000	Group Length
 0018,0000	Group Length
+0008,0000	Group Length
+7fe0,0000	Group Length
 0028,0030	Pixel Spacing
 0028,1054	Rescale Type
 0028,1053	Rescale Slope
 0028,1052	Rescale Intercept
+#0009,0011	some sort of list
+0008,0012	Instance Creation Date
+0008,0013	Instance Creation Time
+0028,0101	Bits Stored
+
 # not that important
 0028,1051	Window Width
 0028,1050	Window Center
@@ -50,4 +58,5 @@
 0008,0104	Code Meaning
 0008,0102	Coding Scheme Designator
 0008,0100	Code Value
-0008,0016	SOP Class UID
+0008,0016	SOP Class UID
+#0008,0018	SOP Instance UID
diff --git a/lists/tags_to_hold/tags_hold_for_scientific.txt b/lists/tags_to_hold/tags_hold_for_scientific.txt
@@ -3,5 +3,5 @@
 #
 #hold for scientific
 #
-#0010,0030	birthday
+0010,0030	birthday
 0010,0040	sex
diff --git a/shell_show_tags.py b/shell_show_tags.py
@@ -24,11 +24,24 @@ def getValMaxLen(val):
 
 dataset = dicom.read_file(filePath)
 
+for k, val in dataset.iteritems():
+	print k
+	print val
+	print 10*'#'
+
+
+exit(0)
 for dt in dataset.keys():
 	print 'key:    ', dt
+	#if isinstance([], dt):
+	#	print 'cant show list!'
+	#else:
+	#print 'foo:', type(dt.value), dt.value
 	try:
 		print 'dataset:', dataset[dt]
 		print 'value:  ', getValMaxLen(dataset[dt].value)
 	except Exception as ex:
+		print 'ERROR:'
+		print 'typ:', type(dt)
 		print ex
 	print 10*'#'

Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,5 @@`
`3`	`3`	`#`
`4`	`4`	`#hold for scientific`
`5`	`5`	`#`
`6`		`-#0010,0030 birthday`
	`6`	`+0010,0030 birthday`
`7`	`7`	`0010,0040 sex`