Move pixel value transforms to general image init

Author: CPBridge

src/highdicom/image.py

@@ -1269,6 +1269,10 @@ def _init_multiframe_image(
         ) = PixelRepresentationValues.UNSIGNED_INTEGER,
         contains_recognizable_visual_features: bool | None = None,
         burned_in_annotation: bool | None = None,
+        use_default_pixel_value_transformation: bool = False,
+        shared_voi_lut_transformations: (
+            Sequence[VOILUTTransformation] | None
+        ) = None,
         palette_color_lut_transformation: PaletteColorLUTTransformation | None,
         icc_profile: bytes | None = None,
         pixel_measures: PixelMeasuresSequence | None = None,
@@ -1549,6 +1553,17 @@ def _init_multiframe_image(
             # Set to None so this is not used for per-frame items later
             add_channel_callback = None
 
+        if use_default_pixel_value_transformation:
+            # Identity Pixel Value Transformation
+            transformation_item = Dataset()
+            transformation_item.RescaleIntercept = 0
+            transformation_item.RescaleSlope = 1
+            transformation_item.RescaleType = 'US'
+            sffg_item.PixelValueTransformationSequence = [transformation_item]
+
+        if shared_voi_lut_transformations is not None:
+            sffg_item.FrameVOILUTSequence = shared_voi_lut_transformations
+
         self.SharedFunctionalGroupsSequence = [sffg_item]
 
         # Find indices such that empty planes are removed

src/highdicom/pm/sop.py

@@ -577,9 +577,13 @@ def add_channel_callback(
             ),
             bits_allocated=bits_allocated,
             samples_per_pixel=1,
+            use_default_pixel_value_transformation=True,
+            shared_voi_lut_transformations=voi_lut_transformations,
             palette_color_lut_transformation=palette_color_lut_transformation,
             icc_profile=icc_profile,
-            contains_recognizable_visual_features=False,
+            contains_recognizable_visual_features=(
+                contains_recognizable_visual_features
+            ),
             burned_in_annotation=False,
             pixel_measures=pixel_measures,
             plane_orientation=plane_orientation,
@@ -600,24 +604,6 @@ def add_channel_callback(
             channel_is_indexed=False,
         )
 
-        # Identity Pixel Value Transformation
-        transformation_item = Dataset()
-        transformation_item.RescaleIntercept = 0
-        transformation_item.RescaleSlope = 1
-        transformation_item.RescaleType = 'US'
-        (
-            self
-            .SharedFunctionalGroupsSequence[0]
-            .PixelValueTransformationSequence
-        ) = [transformation_item]
-
-        # Frame VOI LUT With LUT
-        (
-            self
-            .SharedFunctionalGroupsSequence[0]
-            .FrameVOILUTSequence
-        ) = voi_lut_transformations
-
         # Parametric Map Frame Type
         frame_type_item = Dataset()
         frame_type_item.FrameType = self.ImageType

src/highdicom/seg/sop.py

@@ -707,6 +707,7 @@ def preprocess_channel_callback(
             samples_per_pixel=1,
             image_type=['DERIVED', 'PRIMARY'],
             pixel_representation=PixelRepresentationValues.UNSIGNED_INTEGER,
+            use_default_pixel_value_transformation=False,
             palette_color_lut_transformation=palette_color_lut_transformation,
             icc_profile=icc_profile,
             pixel_measures=pixel_measures,