Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/155 change to return results from detect when recipe does not contain filters #156

Merged
merged 25 commits into from
Oct 2, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
c7963ae
Added code to allow screening of private tags based on regex patterns…
wetzelj Feb 26, 2020
f839e2f
Added code to allow screening of private tags based on regex patterns…
wetzelj Feb 26, 2020
8de88bb
Merge branch 'master' of https://github.com/wetzelj/deid
wetzelj Feb 26, 2020
7c7a600
Updated documentation - dicom-put.md
wetzelj Feb 27, 2020
54c636b
Modified header.py to correct formatting issues
wetzelj Feb 27, 2020
d218c31
Revert "Modified header.py to correct formatting issues"
wetzelj Mar 5, 2020
09419c3
Revert "Updated documentation - dicom-put.md"
wetzelj Mar 5, 2020
95b01da
Revert "Added code to allow screening of private tags based on regex …
wetzelj Mar 5, 2020
5e321ff
Merge remote-tracking branch 'upstream/master'
wetzelj Mar 5, 2020
6f75f41
Merge remote-tracking branch 'upstream/master'
wetzelj Mar 6, 2020
318a89e
Merge remote-tracking branch 'upstream/master'
wetzelj Mar 16, 2020
8d2ff4f
Merge remote-tracking branch 'upstream/master'
wetzelj Mar 30, 2020
2765f0c
Merge remote-tracking branch 'upstream/master'
wetzelj Apr 30, 2020
858d407
Merge remote-tracking branch 'upstream/master'
wetzelj Jun 25, 2020
ff74146
Merge remote-tracking branch 'upstream/master'
wetzelj Jul 2, 2020
dfda9e9
Merge remote-tracking branch 'upstream/master'
wetzelj Aug 10, 2020
bec5696
Merge remote-tracking branch 'upstream/master'
wetzelj Sep 2, 2020
d5b5c51
Merge remote-tracking branch 'upstream/master'
wetzelj Sep 9, 2020
b01c351
Merge remote-tracking branch 'upstream/master'
wetzelj Sep 10, 2020
de2ce7f
Merge remote-tracking branch 'upstream/master'
wetzelj Sep 15, 2020
f20052f
Merge remote-tracking branch 'upstream/master'
wetzelj Sep 22, 2020
0cc32e7
Merge remote-tracking branch 'upstream/master'
wetzelj Sep 30, 2020
b2d2381
Merge branch 'fix/155' of https://github.com/wetzelj/deid into fix/155
mjcbello Oct 2, 2020
5bae2a7
Change to return results from detect when recipe does not contain fil…
mjcbello Oct 2, 2020
b2e716d
Change to return results from detect when recipe does not contain fil…
mjcbello Oct 2, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Referenced versions in headers are tagged on Github, in parentheses are for pypi

## [vxx](https://github.com/pydicom/deid/tree/master) (master)
- changing iteration technique through fields to properly add nested uids [#153](https://github.com/pydicom/deid/issues/153) (0.2.22)
- change to return results from detect when recipe does not contain filters [#155](https://github.com/pydicom/deid/issues/155)
- fix to correct bug in detect [#142](https://github.com/pydicom/deid/issues/142) (0.2.21)
- fixes to detect and clean to better represent keep/coordinates (0.2.20)
- modify default VR for added tags [#146](https://github.com/pydicom/deid/issues/146), bug with private tags in %fields section [#147](https://github.com/pydicom/deid/issues/147) (0.2.19)
Expand Down
11 changes: 6 additions & 5 deletions deid/dicom/pixels/detect.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,15 +121,16 @@ def _has_burned_pixels_single(dicom_file, force, deid):
"""
dicom = read_file(dicom_file, force=force)

# Load criteria (actions) for flagging
filters = deid.get_filters()
if not filters:
bot.exit("Deid provided does not have %filter, exiting.")

# Return list with lookup as dicom_file
results = []
global_flagged = False

# Load criteria (actions) for flagging
filters = deid.get_filters()
if not filters:
bot.warning("Deid provided does not have %filter.")
return {"flagged": global_flagged, "results": results}

for name, items in filters.items():
for item in items:
flags = []
Expand Down