@@ -79,15 +79,14 @@ function Tree(
79
79
80
80
function format (x:: AbstractArray , md):: Tree
81
81
return (Tree (Dict (" Size" => string (size (x)), " Type" => typeof (x)),
82
- with_keys= with_keys,
83
82
guides= guides,
84
83
title= " Array" ,
85
84
maxdepth= md))
86
85
end
87
86
88
87
function format (x:: Vector , md):: Tree
89
88
if length (x) <= 6
90
- return Tree (string (x), with_keys = with_keys, guides= guides)
89
+ return Tree (string (x), guides= guides)
91
90
else
92
91
return Tree (Dict (" Length" => length (x),
93
92
" ElementsType" => eltype (x),
@@ -96,14 +95,14 @@ function Tree(
96
95
end
97
96
98
97
function format (x:: DICOM.DICOMData , md):: Tree
99
- return Tree (x. meta, with_keys = with_keys, guides= guides, title= " " , maxdepth= md)
98
+ return Tree (x. meta, guides= guides, title= " " , maxdepth= md)
100
99
end
101
100
102
101
function format (x:: Vector{DICOM.DICOMData} , md):: Tree
103
102
if md >= 2
104
- return Tree (Tree .(x, with_keys= with_keys, guides= guides, title= " " , maxdepth= md), with_keys = with_keys, guides= guides, title= " " , maxdepth= md)
103
+ return Tree (Tree .(x, with_keys= with_keys, guides= guides, title= " " , maxdepth= md), guides= guides, title= " " , maxdepth= md)
105
104
else
106
- return Tree (Dict (" Length" => length (keys (x))), with_keys = with_keys, guides= guides, title= " Vector of DICOMData" , maxdepth= md)
105
+ return Tree (Dict (" Length" => length (keys (x))), guides= guides, title= " Vector of DICOMData" , maxdepth= md)
107
106
end
108
107
end
109
108
@@ -115,7 +114,8 @@ function Tree(
115
114
tree[symbol] = format (dicom[symbol], md - 1 )
116
115
end
117
116
else
118
- for symbol in get_name_from_tag .(keys (dicom. meta))
117
+ tag_names = get_name_from_tag .(keys (dicom. meta))
118
+ for symbol in tag_names
119
119
tree[symbol] = format (dicom[symbol], md - 1 )
120
120
end
121
121
end
@@ -126,7 +126,7 @@ function Tree(
126
126
title = " "
127
127
end
128
128
129
- return Tree (tree, with_keys = with_keys, guides= guides, title= title, maxdepth= md - 1 )
129
+ return Tree (tree, guides= guides, title= title, maxdepth= md - 1 )
130
130
131
131
end
132
132
@@ -143,7 +143,7 @@ function Tree(
143
143
kwargs...
144
144
)
145
145
md = haskey (kwargs, :maxdepth ) ? kwargs[:maxdepth ] : 2
146
- return Tree (Tree .(dicom_vector, with_keys= with_keys, guides= guides, title= " " , maxdepth= md), with_keys = with_keys, guides= guides, title= " " , maxdepth= md)
146
+ return Tree (Tree .(dicom_vector, with_keys= with_keys, guides= guides, title= " " , maxdepth= md), guides= guides, title= " " , maxdepth= md)
147
147
end
148
148
149
149
end
0 commit comments