Skip to content

Commit aee5b1f

Browse files
authored
Merge pull request JuliaHealth#4 from Dale-Black/dale-fix
Dale fix
2 parents e302bdf + d2f3683 commit aee5b1f

File tree

2 files changed

+8
-19
lines changed

2 files changed

+8
-19
lines changed

src/DICOM.jl

-11
Original file line numberDiff line numberDiff line change
@@ -131,21 +131,10 @@ always_implicit(grp, elt) =
131131

132132
function find_dicom_files(dir)
133133
files = joinpath.(dir, readdir(dir))
134-
dicom_files = []
135-
# for file in 1:length(files)
136-
# if isdicom(file)
137-
# push!(dicom_files, file)
138-
# end
139-
# end
140134
dicom_files = filter(file -> isdicom(file), files)
141135
return dicom_files
142136
end
143137

144-
# function isdicom(file)
145-
# bytes = read(file, 132)[end-3:end]
146-
# String(bytes) == "DICM"
147-
# end
148-
149138
function isdicom(file)
150139
try
151140
bytes = read(file, 132)[end-3:end]

test/runtests.jl

+8-8
Original file line numberDiff line numberDiff line change
@@ -232,14 +232,14 @@ end
232232
@test length(dcms) == length(readdir(data_folder)) - 3 # -3 because of note above
233233
end
234234

235-
# @testset "isdicom" begin
236-
# answer = DICOM.isdicom("test/testdata/brain.bmp")
237-
# @test answer === nothing
238-
239-
# fileDX = download_dicom("DX_Implicit_Little_Interleaved.dcm")
240-
# answer2 = DICOM.isdicom(fileDX)
241-
# @test answer2 == true
242-
# end
235+
@testset "isdicom" begin
236+
answer = DICOM.isdicom("test/testdata/brain.bmp")
237+
@test answer === false
238+
239+
fileDX = download_dicom("DX_Implicit_Little_Interleaved.dcm")
240+
answer2 = DICOM.isdicom(fileDX)
241+
@test answer2 == true
242+
end
243243

244244
@testset "Test tag macro" begin
245245
@test tag"Modality" === (0x0008, 0x0060) === DICOM.fieldname_dict[:Modality]

0 commit comments

Comments
 (0)