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.

Sign up for GitHub

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

Jump to bottom

[MRG] Add convenience function Event.encoded_dataset() #888

Merged
merged 10 commits into from
Nov 17, 2023
Merged

[MRG] Add convenience function Event.encoded_dataset() #888

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1e0ff9e
Add convenience function to Event for encoding a conformant DICOM Fil…
scaramallion Nov 17, 2023
d713292
Fix list capitalisation
scaramallion Nov 17, 2023
d8298d9
Doc improvements
scaramallion Nov 17, 2023
2deb22d
Fix type hints
scaramallion Nov 17, 2023
54eabd3
Use encoded_dataset() in apps
scaramallion Nov 17, 2023
de2431b
Fix missing bracket
scaramallion Nov 17, 2023
2bef5f3
Remove unused imports
scaramallion Nov 17, 2023
793bd72
Add versionadded
scaramallion Nov 17, 2023
08c8d89
Fix missing import
scaramallion Nov 17, 2023
f8a1f4d
Fix missing import 2
scaramallion Nov 17, 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
Prev Previous commit
Next Next commit
Add versionadded
  • Loading branch information
@scaramallion
scaramallion committed Nov 17, 2023
commit 793bd7217e7e724f974ce2d0567f8e940c836276
6 changes: 5 additions & 1 deletion pynetdicom/dsutils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,11 @@ def encode(


def encode_file_meta(file_meta: FileMetaDataset) -> bytes:
"""Return the encoded File Meta Information elements in `file_meta`."""
"""Return the encoded File Meta Information elements in `file_meta`.

.. versionadded:: 2.1

"""

buffer = DicomBytesIO()
buffer.is_little_endian = True
Expand Down
6 changes: 4 additions & 2 deletions pynetdicom/events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,6 +630,8 @@ def encoded_dataset(self, include_meta: bool = True) -> bytes:
"""Return the encoded C-STORE dataset sent by the peer without first
decoding it.

.. versionadded:: 2.1

Examples
--------
Retrieve the encoded dataset as sent by the peer::
Expand Down Expand Up @@ -677,12 +679,12 @@ def handle_store(event: pynetdicom.events.Event, dst: pathlib.Path) -> int:
if not include_meta:
return stream

return b"".join([
return b"".join((
b"\x00" * 128,
b"DICM",
encode_file_meta(self.file_meta),
stream,
])
))

@property
def event(self) -> EventType:
Expand Down
Loading