dbdicom 0.2.1__tar.gz → 0.2.3__tar.gz

dbdicom-0.2.3/PKG-INFO

@@ -0,0 +1,88 @@
+Metadata-Version: 2.1
+Name: dbdicom
+Version: 0.2.3
+Summary: A pythonic interface for reading and writing DICOM databases
+Author-email: Steven Sourbron <s.sourbron@sheffield.ac.uk>, Ebony Gunwhy <e.gunwhy@sheffield.ac.uk>
+Project-URL: Homepage, https://qib-sheffield.github.io/dbdicom/
+Keywords: python,medical imaging,DICOM
+Classifier: Development Status :: 3 - Alpha
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Science/Research
+Classifier: Topic :: Scientific/Engineering
+Classifier: Environment :: Console
+Classifier: Operating System :: OS Independent
+Classifier: License :: OSI Approved :: Apache Software License
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Requires-Python: >=3.6
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: matplotlib
+Requires-Dist: nibabel
+Requires-Dist: numpy<=1.26.4
+Requires-Dist: pandas
+Requires-Dist: pydicom
+Requires-Dist: python-gdcm
+Requires-Dist: pylibjpeg-libjpeg
+Requires-Dist: importlib-resources
+Requires-Dist: scipy
+Requires-Dist: imageio
+Provides-Extra: docs
+Requires-Dist: sphinx; extra == "docs"
+Requires-Dist: pydata-sphinx-theme; extra == "docs"
+Requires-Dist: myst-parser; extra == "docs"
+Requires-Dist: sphinx-copybutton; extra == "docs"
+Requires-Dist: sphinx-design; extra == "docs"
+Requires-Dist: sphinx-remove-toctrees; extra == "docs"
+Requires-Dist: autodocsumm; extra == "docs"
+Requires-Dist: docutils; extra == "docs"
+Requires-Dist: sphinxcontrib-applehelp; extra == "docs"
+Requires-Dist: sphinxcontrib-devhelp; extra == "docs"
+Requires-Dist: sphinxcontrib-htmlhelp; extra == "docs"
+Requires-Dist: sphinxcontrib-jsmath; extra == "docs"
+Requires-Dist: sphinxcontrib-qthelp; extra == "docs"
+Requires-Dist: sphinxcontrib-serializinghtml; extra == "docs"
+Requires-Dist: sphinx-gallery; extra == "docs"
+Provides-Extra: extensions
+Requires-Dist: scipy; extra == "extensions"
+Requires-Dist: scikit-image<=0.19.0; extra == "extensions"
+Requires-Dist: SimpleITK-SimpleElastix; extra == "extensions"
+Requires-Dist: itk-elastix; extra == "extensions"
+Requires-Dist: dipy; extra == "extensions"
+Requires-Dist: scikit-learn; extra == "extensions"
+
+`dbdicom` is a Pythonic interface for reading and writing DICOM databases.
+
+# Installation
+
+`pip install dbdicom`
+
+# Documentation
+
+For more detail, see the current [dbdicom documentation](https://qib-sheffield.github.io/dbdicom/).
+
+# Ambition
+
+The DICOM format is the universally recognised standard for medical imaging, 
+but working with DICOM data remains a challenging task for data scientists. 
+
+``dbdicom`` aims to provide an intuitive programming interface for reading and 
+writing DICOM databases - replacing unfamiliar DICOM-native concepts by 
+pythonic language and syntax. 
+
+# Disclaimer
+
+`dbdicom` is developed in public and currently trialled in ongoing 
+multi-centre clinical studies 
+[iBEAt](https://bmcnephrol.biomedcentral.com/articles/10.1186/s12882-020-01901-x>) 
+and [AFiRM](https://www.uhdb.nhs.uk/afirm-study/). However, ``dbdicom`` is 
+work in progress and **not yet sufficiently stable for wider use**. Current 
+dissemination activities, such as on the 
+[ISMRM (Toronto 2023)](https://www.ismrm.org/23m/), are limited in scope and 
+intended to get early feedback from the community. 
+
+
+
+
+
+

dbdicom-0.2.3/README.md

@@ -0,0 +1,35 @@
+`dbdicom` is a Pythonic interface for reading and writing DICOM databases.
+
+# Installation
+
+`pip install dbdicom`
+
+# Documentation
+
+For more detail, see the current [dbdicom documentation](https://qib-sheffield.github.io/dbdicom/).
+
+# Ambition
+
+The DICOM format is the universally recognised standard for medical imaging, 
+but working with DICOM data remains a challenging task for data scientists. 
+
+``dbdicom`` aims to provide an intuitive programming interface for reading and 
+writing DICOM databases - replacing unfamiliar DICOM-native concepts by 
+pythonic language and syntax. 
+
+# Disclaimer
+
+`dbdicom` is developed in public and currently trialled in ongoing 
+multi-centre clinical studies 
+[iBEAt](https://bmcnephrol.biomedcentral.com/articles/10.1186/s12882-020-01901-x>) 
+and [AFiRM](https://www.uhdb.nhs.uk/afirm-study/). However, ``dbdicom`` is 
+work in progress and **not yet sufficiently stable for wider use**. Current 
+dissemination activities, such as on the 
+[ISMRM (Toronto 2023)](https://www.ismrm.org/23m/), are limited in scope and 
+intended to get early feedback from the community. 
+
+
+
+
+
+

{dbdicom-0.2.1 → dbdicom-0.2.3}/pyproject.toml

@@ -1,18 +1,24 @@
 # https://python-poetry.org/docs/pyproject
 # minimal required information
 
+[build-system]
+build-backend = 'setuptools.build_meta'
+requires = ['setuptools>=61.2']
+
 [project]
 name = "dbdicom"
-version = "0.2.1"
+version = "0.2.3"
 dependencies = [ 
     "matplotlib",
     "nibabel",
-    "numpy",
+    "numpy<=1.26.4",
     "pandas",
     "pydicom", 
     "python-gdcm",
     "pylibjpeg-libjpeg",
     "importlib-resources", #necessary?
+    'scipy',
+    'imageio',
 ]
 
 # optional information
@@ -23,7 +29,7 @@ authors = [
   { name = "Steven Sourbron", email = "s.sourbron@sheffield.ac.uk" },
   { name = "Ebony Gunwhy", email = "e.gunwhy@sheffield.ac.uk" }, 
   ]
-license = { file = "LICENSE" }
+#license = "Apache-2.0"
 classifiers = [
   # How mature is this project? Common values are
   #   3 - Alpha
@@ -68,8 +74,9 @@ docs = [
     "sphinxcontrib-jsmath",
     "sphinxcontrib-qthelp",
     "sphinxcontrib-serializinghtml",
+    "sphinx-gallery",
 ]
-wrappers = [
+extensions = [
     "scipy",
     # restricting to the latest stable release for now due to a bug
     # introduced in 0.20.0 that causes executables to crash. The bug is known
@@ -83,6 +90,7 @@ wrappers = [
     "scikit-image<=0.19.0", 
     #"SimpleITK", "itk-elastix",
     "SimpleITK-SimpleElastix",
+    "itk-elastix",
     "dipy",
     "scikit-learn",
 ]

{dbdicom-0.2.1 → dbdicom-0.2.3}/src/dbdicom/__init__.py

@@ -1,13 +1,13 @@
 
 from .create import (
     database,
-    database_hollywood,
     patient,
     study,
     series, 
     as_series,
     zeros,
     ones,
+    empty_series,
 )
 from .record import (
     copy_to, 
@@ -23,5 +23,6 @@ from .types.database import Database
 from .types.patient import Patient
 from .types.study import Study
 from .types.series import Series
-
-from .utils import image
+from .utils import image
+from . import extensions
+from . import dro

{dbdicom-0.2.1 → dbdicom-0.2.3}/src/dbdicom/create.py

@@ -6,7 +6,7 @@ from dbdicom.manager import Manager
 from dbdicom.types.database import Database
 from dbdicom.types.patient import Patient
 from dbdicom.types.study import Study
-from dbdicom.types.series import Series
+from dbdicom.types.series import Series, _coords_size, _grid_to_coords
 from dbdicom.types.instance import Instance
 
 
@@ -270,6 +270,7 @@ def series(dtype='mri', in_study:Study=None, in_database:Database=None, **kwargs
     else:
         if in_database is None:
             _database = database()
+            _database.mute()
         else:
             _database = in_database
         patient = _database.new_patient()
@@ -281,73 +282,14 @@ def series(dtype='mri', in_study:Study=None, in_database:Database=None, **kwargs
 
 
 
-def database_hollywood()->Database:
-    """Create an empty toy database for demonstration purposes.
 
-    Returns:
-        Database: Database with two patients, two studies per patient and two empty series per study.
-
-    See Also:
-        :func:`~database`
-
-    Example:
-        >>> database = db.database_hollywood()
-        >>> database.print()
-        ---------- DATABASE --------------
-        Location:  In memory
-            Patient James Bond
-                Study MRI [19821201]
-                    Series 001 [Localizer]
-                        Nr of instances: 0
-                    Series 002 [T2w]
-                        Nr of instances: 0
-                Study Xray [19821205]
-                    Series 001 [Chest]
-                        Nr of instances: 0
-                    Series 002 [Head]
-                        Nr of instances: 0
-            Patient Scarface
-                Study MRI [19850105]
-                    Series 001 [Localizer]
-                        Nr of instances: 0
-                    Series 002 [T2w]
-                        Nr of instances: 0
-                Study Xray [19850106]
-                    Series 001 [Chest]
-                        Nr of instances: 0
-                    Series 002 [Head]
-                        Nr of instances: 0
-        ---------------------------------
-    """
-    hollywood = database()
-
-    james_bond = hollywood.new_patient(PatientName='James Bond')
-    james_bond_mri = james_bond.new_study(StudyDescription='MRI', StudyDate='19821201')
-    james_bond_mri_localizer = james_bond_mri.new_series(SeriesDescription='Localizer')
-    james_bond_mri_T2w = james_bond_mri.new_series(SeriesDescription='T2w')
-    james_bond_xray = james_bond.new_study(StudyDescription='Xray', StudyDate='19821205')
-    james_bond_xray_chest = james_bond_xray.new_series(SeriesDescription='Chest')
-    james_bond_xray_head = james_bond_xray.new_series(SeriesDescription='Head')
-
-    scarface = hollywood.new_patient(PatientName='Scarface')
-    scarface_mri = scarface.new_study(StudyDescription='MRI', StudyDate='19850105')
-    scarface_mri_localizer = scarface_mri.new_series(SeriesDescription='Localizer')
-    scarface_mri_T2w = scarface_mri.new_series(SeriesDescription='T2w')
-    scarface_xray = scarface.new_study(StudyDescription='Xray', StudyDate='19850106')
-    scarface_xray_chest = scarface_xray.new_series(SeriesDescription='Chest')
-    scarface_xray_head = scarface_xray.new_series(SeriesDescription='Head')
-
-    return hollywood
-
-
-
-
-def as_series(array:np.ndarray, coords:dict=None, dtype='mri', in_study:Study=None, in_database:Database=None, **kwargs)->Series:
+def as_series(array:np.ndarray, coords:dict=None, gridcoords:dict=None, dtype='mri', in_study:Study=None, in_database:Database=None, **kwargs)->Series:
     """Create a DICOM series from a numpy array.
 
     Args:
         array (np.ndarray): numpy.ndarray with image data
-        coords (dict, optional): Dictionary with coordinate labels and values. For 3- or 4-dimensional arrays this is optional but for arrays with more than 4 dimensions this is required. The coordinate values can be one-dimensions for regularly gridded data, or n-dimensional for irregularly gridded data. 
+        coords (dict, optional): Dictionary with coordinate labels and values. For 3- or 4-dimensional arrays this is optional but for arrays with more than 4 dimensions either *coords* or *gridcoords* are required. 
+        gridcoords (dict, optional): regularly gridded coordinates can also be provided as a coordinate grid.
         dtype (str, optional): The type of the series to create. Defaults to 'mri'.
         in_study (Study, optional): If provided, the series is created in this study. Defaults to None.
         in_database (Database, optional): If provided, the series is created in this database. Defaults to None.
@@ -404,23 +346,37 @@ def as_series(array:np.ndarray, coords:dict=None, dtype='mri', in_study:Study=No
     """
     shape = array.shape
     if coords is None:
-        if len(shape) > 4:
-            msg = 'With more than 4 dimensions, the coordinates argument is required'
-            raise ValueError(msg)
-        else:
-            coords = {}
+        if gridcoords is None:
+            if len(shape) > 4:
+                msg = 'With more than 4 dimensions, the coords argument is required.'
+                raise ValueError(msg)
+            gridcoords = {}
+            if len(shape) == 2:
+                gridcoords['InstanceNumber'] = np.array([1])
             if len(shape) > 2:
-                coords['SliceLocation'] = np.arange(array.shape[2])
+                gridcoords['SliceLocation'] = np.arange(shape[2])
             if len(shape) > 3:
-                coords['AcquisitionTime'] = np.arange(array.shape[3])
+                gridcoords['AcquisitionTime'] = np.arange(shape[3])
+    if gridcoords is not None:
+        coords = _grid_to_coords(gridcoords)
+    sery = series(dtype=dtype, in_study=in_study, in_database=in_database, **kwargs)
+    sery.expand(coords)
+    sery.set_pixel_values(array, dims=tuple(coords))
+    return sery
+
+
+def empty_series(coords:dict=None, gridcoords:dict=None,  dtype='mri', in_study:Study=None, in_database:Database=None, **kwargs)->Series:
+
+    if gridcoords is not None:
+        coords = _grid_to_coords(gridcoords)
     sery = series(dtype=dtype, in_study=in_study, in_database=in_database, **kwargs)
-    sery.mute()
-    sery.set_ndarray(array, coords=coords)
-    sery.unmute()
+    if coords is None:
+        return sery
+    sery.expand(coords)
     return sery
 
 
-def zeros(shape:tuple, coords:dict=None, **kwargs) -> Series:
+def zeros(shape:tuple, coords:dict=None, gridcoords:dict=None, **kwargs) -> Series:
     """Create a DICOM series populated with zeros.
 
     This is a convenience wrapper providing a numpy-like interface for :func:`~as_series`.
@@ -456,21 +412,12 @@ def zeros(shape:tuple, coords:dict=None, **kwargs) -> Series:
         >>> array = np.zeros((128, 128, 2, 3))
         >>> zeros = db.as_series(array)
     """
-    if coords is None:
-        if len(shape) > 4:
-            msg = 'With more than 4 dimensions, the coordinates argument is required'
-            raise ValueError(msg)
-        else:
-            coords = {}
-            if len(shape) > 2:
-                coords['SliceLocation'] = np.arange(shape[2])
-            if len(shape) > 3:
-                coords['AcquisitionTime'] = np.arange(shape[3])
+
     array = np.zeros(shape, dtype=np.float32)
-    return as_series(array, coords=coords, **kwargs)
+    return as_series(array, coords=coords, gridcoords=gridcoords, **kwargs)
 
 
-def ones(shape:tuple, coords:dict=None, **kwargs) -> Series:
+def ones(shape:tuple, coords:dict=None, gridcoords:dict=None, **kwargs) -> Series:
     """Create a DICOM series populated with ones.
 
     This is a convenience wrapper providing a numpy-like interface for :func:`~as_series`.
@@ -506,15 +453,5 @@ def ones(shape:tuple, coords:dict=None, **kwargs) -> Series:
         >>> array = np.ones((128, 128, 2, 3))
         >>> zeros = db.as_series(array)
     """
-    if coords is None:
-        if len(shape) > 4:
-            msg = 'With more than 4 dimensions, the coordinates argument is required'
-            raise ValueError(msg)
-        else:
-            coords = {}
-            if len(shape) > 2:
-                coords['SliceLocation'] = np.arange(shape[2])
-            if len(shape) > 3:
-                coords['AcquisitionTime'] = np.arange(shape[3])
     array = np.ones(shape, dtype=np.float32)
-    return as_series(array, coords=coords, **kwargs)
+    return as_series(array, coords=coords, gridcoords=gridcoords, **kwargs)

dbdicom-0.2.3/src/dbdicom/dro.py

@@ -0,0 +1,174 @@
+# Importing annotations to handle or sign in import type hints
+from __future__ import annotations
+
+import numpy as np
+import dbdicom as db
+from dbdicom.types.database import Database
+from dbdicom.types.series import Series
+from dbdicom.utils import image
+
+
+def T1_mapping_vFATR(spacing = (15, 15, 20), fov = (300, 250, 120), T1min = 600, S0min = 100, vFA = [2.0, 20.0], vTR = [5.0,15.0])->Series:
+    """Synthetic T1-mapping data with variable TR and FA
+
+    Args:
+        spacing (tuple, optional): x, y, z pixel spacing in mm. Defaults to (1.5, 1.5, 2.0).
+        fov (tuple, optional): x, y, z field of view in mm. Defaults to (300, 250, 120).
+        T1min (int, optional): smallest T1 in msec. Defaults to 600.
+        S0min (int, optional): smallest S0 in a.u. Defaults to 100.
+        vFA (list, optional): variable flip angle values in degrees. Defaults to [2.0, 5.0, 10.0, 15.0, 20.0].
+        vTR (list, optional): variable repetition time values in msec. Defaults to [2.0, 3.0, 4.0, 5.0, 10.0, 15.0].
+
+    Returns:
+        dbdicom.Series: A series with appropriate array and header data.
+    """
+    ellipsoid = image.ellipsoid(fov[0]/2, fov[1]/2, fov[2]/2, spacing=spacing, levelset=True)
+    ellipsoid = 1 + ellipsoid - np.amin(ellipsoid)
+    T1 = T1min*ellipsoid
+    S0 = S0min*ellipsoid
+    array = np.empty((T1.shape[0], T1.shape[1], T1.shape[2], len(vFA), len(vTR)))
+    for j, TR in enumerate(vTR):
+        Ej = np.exp(-TR/T1)
+        for i, FA in enumerate(vFA):
+            ci = np.cos(FA*np.pi/180)
+            array[:,:,:,i,j] = S0 * (1-Ej) / (1-ci*Ej)
+    
+    coords = {
+        'SliceLocation': spacing[2]*np.arange(array.shape[2]),
+        'FlipAngle': np.array(vFA),
+        'RepetitionTime': np.array(vTR),
+    }
+    v0, v1 = np.amin(array), np.amax(array)
+    series = db.as_series(array, gridcoords=coords, PixelSpacing=[spacing[1],spacing[0]], WindowWidth=v1-v0, WindowCenter=(v0+v1)/2)
+    series.patient().PatientName = 'Ellipsoid'
+    series.study().StudyDescription = 'Synthetic'
+    series.SeriesDescription = 'T1 mapping variable TR and FA'
+
+    return series
+    
+
+def ellipsoid(a, b, c, spacing=(1., 1., 1.), levelset=False)->Series:
+    """
+    Generates ellipsoid with semimajor axes aligned with grid dimensions
+    on grid with specified `spacing`.
+
+    Args:
+        a (float): Length of semimajor axis aligned with x-axis.
+        b (float): Length of semimajor axis aligned with y-axis.
+        c (float): Length of semimajor axis aligned with z-axis.
+        spacing (tuple of floats, length 3): Spacing in (x, y, z) spatial dimensions. Defaults to (1,1,1)
+        levelset (bool): If True, returns the level set for this ellipsoid (signed level set about zero, with positive denoting interior) as np.float64. False returns a binarized version of said level set. Defaults to False.
+    
+    Returns:
+        dbdicom.Series: A series with appropriate array and header data.
+    
+    Note:
+        The interface and the array generation is taken directly from skimage but the core function is copied into dbdicom utilities to avoid bringing in skimage as an essential dependency.
+    """
+    arr = image.ellipsoid(a, b, c, spacing=spacing, levelset=levelset)
+    coords = {'SliceLocation': spacing[2]*np.arange(arr.shape[2])}
+    v0, v1 = np.amin(arr), np.amax(arr)
+    series = db.as_series(arr, gridcoords=coords, PixelSpacing=[spacing[1],spacing[0]], WindowWidth=v1-v0, WindowCenter=(v0+v1)/2)
+    affine = np.array(
+        [[spacing[1], 0., 0., 0.],
+         [0., spacing[0], 0., 0.],
+         [0., 0., spacing[2], 0.],
+         [0., 0., 0., 1.]]
+    )
+    series.set_affine(affine)
+    series.patient().PatientName = 'Ellipsoid'
+    series.study().StudyDescription = 'Synthetic'
+    series.SeriesDescription = 'Levelset ellipsoid'
+    return series
+
+
+def double_ellipsoid(a, b, c, spacing=(1., 1., 1.), levelset=False)->Series:
+    """
+    Generates a double ellipsoid with semimajor axes aligned with grid dimensions
+    on grid with specified `spacing`.
+
+    Args:
+        a (float): Length of semimajor axis aligned with x-axis.
+        b (float): Length of semimajor axis aligned with y-axis.
+        c (float): Length of semimajor axis aligned with z-axis.
+        spacing (tuple of floats, length 3): Spacing in (x, y, z) spatial dimensions. Defaults to (1,1,1)
+        levelset (bool): If True, returns the level set for this ellipsoid (signed level set about zero, with positive denoting interior) as np.float64. False returns a binarized version of said level set. Defaults to False.
+
+    Returns:
+        dbdicom.Series: A series with appropriate array and header data.
+    
+    Note:
+        The interface and the array generation is taken directly from skimage, but the core function is copied into dbdicom utilities to avoid bringing in skimage as an essential dependency.
+    """
+    arr = image.ellipsoid(a, b, c, spacing=spacing, levelset=levelset)
+    coords = {'SliceLocation': spacing[2]*np.arange(arr.shape[2])}
+    arr = np.concatenate((arr[:-1, ...], arr[2:, ...]), axis=0)
+    v0, v1 = np.amin(arr), np.amax(arr)
+    series = db.as_series(arr, gridcoords=coords, PixelSpacing=[spacing[1],spacing[0]], WindowWidth=v1-v0, WindowCenter=(v0+v1)/2)
+    series.patient().PatientName = 'Ellipsoid'
+    series.study().StudyDescription = 'Synthetic'
+    series.SeriesDescription = 'Levelset ellipsoid'
+    return series
+
+
+def database_hollywood()->Database:
+    """Create an empty toy database for demonstration purposes.
+
+    Returns:
+        Database: Database with two patients, two studies per patient and two empty series per study.
+
+    See Also:
+        :func:`~database`
+
+    Example:
+        >>> database = db.dro.database_hollywood()
+        >>> database.print()
+        ---------- DATABASE --------------
+        Location:  In memory
+            Patient James Bond
+                Study MRI [19821201]
+                    Series 001 [Localizer]
+                        Nr of instances: 0
+                    Series 002 [T2w]
+                        Nr of instances: 0
+                Study Xray [19821205]
+                    Series 001 [Chest]
+                        Nr of instances: 0
+                    Series 002 [Head]
+                        Nr of instances: 0
+            Patient Scarface
+                Study MRI [19850105]
+                    Series 001 [Localizer]
+                        Nr of instances: 0
+                    Series 002 [T2w]
+                        Nr of instances: 0
+                Study Xray [19850106]
+                    Series 001 [Chest]
+                        Nr of instances: 0
+                    Series 002 [Head]
+                        Nr of instances: 0
+        ---------------------------------
+    """
+    hollywood = db.database()
+    hollywood.mute()
+
+    james_bond = hollywood.new_patient(PatientName='James Bond')
+    james_bond_mri = james_bond.new_study(StudyDescription='MRI', StudyDate='19821201')
+    james_bond_mri_localizer = james_bond_mri.new_series(SeriesDescription='Localizer')
+    james_bond_mri_T2w = james_bond_mri.new_series(SeriesDescription='T2w')
+    james_bond_xray = james_bond.new_study(StudyDescription='Xray', StudyDate='19821205')
+    james_bond_xray_chest = james_bond_xray.new_series(SeriesDescription='Chest')
+    james_bond_xray_head = james_bond_xray.new_series(SeriesDescription='Head')
+
+    scarface = hollywood.new_patient(PatientName='Scarface')
+    scarface_mri = scarface.new_study(StudyDescription='MRI', StudyDate='19850105')
+    scarface_mri_localizer = scarface_mri.new_series(SeriesDescription='Localizer')
+    scarface_mri_T2w = scarface_mri.new_series(SeriesDescription='T2w')
+    scarface_xray = scarface.new_study(StudyDescription='Xray', StudyDate='19850106')
+    scarface_xray_chest = scarface_xray.new_series(SeriesDescription='Chest')
+    scarface_xray_head = scarface_xray.new_series(SeriesDescription='Head')
+
+    return hollywood
+
+if __name__ == '__main__':
+    T1_mapping_vFATR()

{dbdicom-0.2.1 → dbdicom-0.2.3}/src/dbdicom/ds/dataset.py

@@ -306,9 +306,21 @@ def set_values(ds, tags, values, VR=None):
                     ds[tag].value = format_value(values[i], tag=tag)
                 else:
                     _add_new(ds, tag, values[i], VR=VR[i])
+
+        #_set_derived_data_element(ds, tag, values[i])
+                
     return ds
 
 
+# def _set_derived_data_element(ds, tag, value):
+#     """Set any tags that are need to change as well"""
+
+#     if tag == 'SliceLocation' or tag == (0x0020, 0x1041):
+#         if value is not None: 
+#             loc = ds['ImageOrientationPatient'].value
+#             ds['ImagePositionPatient'].value = image.image_position_from_slice_location(value, loc)
+
+
 def _add_new(ds, tag, value, VR='OW'):
     if not isinstance(tag, pydicom.tag.BaseTag):
         tag = pydicom.tag.Tag(tag)
@@ -324,10 +336,15 @@ def _add_new(ds, tag, value, VR='OW'):
         ds.add_new(tag, value_repr, format_value(value, value_repr))
     else:
         if (tag.group, 0x0010) not in ds:
-            ds.private_block(tag.group, 'Wezel ' + str(tag.group), create=True)
+            ds.private_block(tag.group, 'dbdicom ' + str(tag.group), create=True)
         ds.add_new(tag, VR, format_value(value, VR))
 
 
+
+
+
+
+
 def get_values(ds, tags):
     """Return a list of values for a dataset"""
 
@@ -347,12 +364,20 @@ def get_values(ds, tags):
                     value = getattr(ds, 'get_attribute_' + tag)()
             else:
                 pydcm_value = ds[tag].value
-                value = to_set_type(pydcm_value, pydicom.datadict.dictionary_VR(tag)) # ELIMINATE THIS STEP - return pydicom datatypes
+                try:
+                    VR = pydicom.datadict.dictionary_VR(tag)
+                except:
+                    VR = None
+                value = to_set_type(pydcm_value, VR) # ELIMINATE THIS STEP - return pydicom datatypes
 
         # If the tag is a tuple of hexadecimal values
         else: 
             if tag in ds:
-                value = to_set_type(ds[tag].value, pydicom.datadict.dictionary_VR(tag))
+                try:
+                    VR = pydicom.datadict.dictionary_VR(tag)
+                except:
+                    VR = None
+                value = to_set_type(ds[tag].value, VR)
 
         # If a tag is not present in the dataset, check if it can be derived
         if value is None:
@@ -374,6 +399,7 @@ def derive_data_element(ds, tag):
     # To be extended ad hoc with other tags that can be derived
 
 
+
 def format_value(value, VR=None, tag=None):
 
     # If the change below is made (TM, DA, DT) then this needs to