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/filter exception #257

Closed
wants to merge 43 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 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
505e642
Merge remote-tracking branch 'upstream/master'
wetzelj Oct 2, 2020
e72b395
Merge remote-tracking branch 'upstream/master'
wetzelj Oct 8, 2020
ba35399
Merge remote-tracking branch 'upstream/master'
wetzelj Dec 1, 2020
4587fe4
Merge remote-tracking branch 'upstream/master'
wetzelj Mar 30, 2021
1b24a39
Merge remote-tracking branch 'upstream/master'
wetzelj Jun 29, 2021
f3fbbc6
Merge remote-tracking branch 'upstream/master'
wetzelj Jun 29, 2021
c0b138a
Merge remote-tracking branch 'upstream/master'
wetzelj Jul 7, 2021
7606cbd
Merge remote-tracking branch 'upstream/master'
wetzelj Jul 7, 2021
03dc23a
Merge remote-tracking branch 'upstream/master'
wetzelj Sep 20, 2021
42446af
Merge remote-tracking branch 'upstream/master'
wetzelj Sep 22, 2021
d523eda
Merge remote-tracking branch 'upstream/master'
wetzelj Sep 22, 2021
2ec3c85
Merge remote-tracking branch 'upstream/master'
wetzelj Oct 11, 2021
2fae6eb
Merge remote-tracking branch 'upstream/master'
wetzelj Oct 18, 2022
031ddcf
Merge remote-tracking branch 'upstream/master'
wetzelj Nov 22, 2022
306fd57
Merge remote-tracking branch 'upstream/master'
wetzelj Dec 7, 2022
caa65fb
Merge remote-tracking branch 'upstream/master'
wetzelj Dec 7, 2022
9cde0fc
Merge remote-tracking branch 'upstream/master'
wetzelj May 10, 2023
add691c
Merge remote-tracking branch 'upstream/master'
wetzelj May 10, 2023
66926c1
explicitly check for DataElement before reference value
wetzelj Sep 11, 2023
966ef2b
bumping version and adding changelog
wetzelj Sep 11, 2023
31c74b5
Sorting imports
wetzelj Sep 11, 2023
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 @@ -14,6 +14,7 @@ and **Merged pull requests**. Critical items to know are:
Referenced versions in headers are tagged on Github, in parentheses are for pypi.

## [vxx](https://github.com/pydicom/deid/tree/master) (master)
- Exception with missing filters for non-string VR [#256](https://github.com/pydicom/deid/issues/256) (0.3.23)
- Allow filter tag names to be 0x-prefix hex numbers so private tags can be referenced in recipes [#253](https://github.com/pydicom/deid/issues/253) (0.3.22)
- Fix incorrect coordinate definition for GE CT [#249](https://github.com/pydicom/deid/issues/249)
- Circular import error [#247](https://github.com/pydicom/deid/issues/247) (0.3.21)
Expand Down
4 changes: 2 additions & 2 deletions deid/dicom/filter.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import re

from pydicom.dataset import Dataset
from pydicom.dataset import DataElement, Dataset

from deid.logger import bot

Expand Down Expand Up @@ -152,7 +152,7 @@ def empty(self, field):
return len(content) == 0

# This is the case of a data element
elif not isinstance(content, str):
elif isinstance(content, DataElement):
content = content.value

if content == "":
Expand Down
2 changes: 1 addition & 1 deletion deid/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
__copyright__ = "Copyright 2016-2023, Vanessa Sochat"
__license__ = "MIT"

__version__ = "0.3.22"
__version__ = "0.3.23"
AUTHOR = "Vanessa Sochat"
AUTHOR_EMAIL = "[email protected]"
NAME = "deid"
Expand Down