Skip to content

Commit

Permalink
Misc tidy-ups
Browse files Browse the repository at this point in the history
  • Loading branch information
CPBridge committed Oct 2, 2024
1 parent cb62737 commit 32c5c70
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Requirements
Installation
------------

Pre-build package available at PyPi:
Pre-built package available at PyPi:

.. code-block:: none
Expand Down
24 changes: 12 additions & 12 deletions src/highdicom/sr/templates.py
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ def _contains_uidref_items(

def _contains_image_items(
parent_item: ContentItem,
name: Union[Code, CodedConcept],
name: Union[Code, CodedConcept, None],
referenced_sop_class_uid: Union[str, None] = None,
referenced_sop_instance_uid: Union[str, None] = None,
relationship_type: Optional[RelationshipTypeValues] = None
Expand All @@ -459,7 +459,7 @@ def _contains_image_items(
----------
parent_item: highdicom.sr.ContentItem
Parent SR Content Item
name: Union[highdicom.sr.CodedConcept, pydicom.sr.coding.Code]
name: Union[highdicom.sr.CodedConcept, pydicom.sr.coding.Code, None]
Name of the child SR Content Item
referenced_sop_class_uid: Union[str, None], optional
SOP Class UID referenced by the content item
Expand Down Expand Up @@ -2095,8 +2095,10 @@ def from_sequence(
('manufacturer_name', codes.DCM.DeviceSubjectManufacturer),
('model_name', codes.DCM.DeviceSubjectModelName),
('serial_number', codes.DCM.DeviceSubjectSerialNumber),
('physical_location',
codes.DCM.DeviceSubjectPhysicalLocationDuringObservation),
(
'physical_location',
codes.DCM.DeviceSubjectPhysicalLocationDuringObservation
),
]
kwargs = {}
for dataset in sequence:
Expand Down Expand Up @@ -3288,7 +3290,8 @@ def __init__(


class PlanarROIMeasurementsAndQualitativeEvaluations(
_ROIMeasurementsAndQualitativeEvaluations):
_ROIMeasurementsAndQualitativeEvaluations
):

""":dcm:`TID 1410 <part16/chapter_A.html#sect_TID_1410>`
Planar ROI Measurements and Qualitative Evaluations"""
Expand All @@ -3302,9 +3305,7 @@ class PlanarROIMeasurementsAndQualitativeEvaluations(
def __init__(
self,
tracking_identifier: TrackingIdentifier,
referenced_region: Optional[
Union[ImageRegion, ImageRegion3D]
] = None,
referenced_region: Union[ImageRegion, ImageRegion3D, None],
referenced_segment: Optional[ReferencedSegmentationFrame] = None,
referenced_real_world_value_map: Optional[RealWorldValueMap] = None,
time_point_context: Optional[TimePointContext] = None,
Expand Down Expand Up @@ -3570,7 +3571,8 @@ def from_sequence(


class VolumetricROIMeasurementsAndQualitativeEvaluations(
_ROIMeasurementsAndQualitativeEvaluations):
_ROIMeasurementsAndQualitativeEvaluations
):

""":dcm:`TID 1411 <part16/chapter_A.html#sect_TID_1411>`
Volumetric ROI Measurements and Qualitative Evaluations"""
Expand All @@ -3585,9 +3587,7 @@ class VolumetricROIMeasurementsAndQualitativeEvaluations(
def __init__(
self,
tracking_identifier: TrackingIdentifier,
referenced_regions: Optional[
Union[Sequence[ImageRegion]]
] = None,
referenced_regions: Optional[Sequence[ImageRegion]] = None,
referenced_volume_surface: Optional[VolumeSurface] = None,
referenced_segment: Optional[ReferencedSegment] = None,
referenced_real_world_value_map: Optional[RealWorldValueMap] = None,
Expand Down

0 comments on commit 32c5c70

Please sign in to comment.