dbdicom 0.3.7__py3-none-any.whl → 0.3.9__py3-none-any.whl

dbdicom/utils/pydicom_dataset.py

@@ -0,0 +1,386 @@
+import math
+import datetime
+
+import numpy as np
+import pydicom
+
+
+
+def get_values(ds, tags):
+    """Return a list of values for a dataset"""
+
+    # https://pydicom.github.io/pydicom/stable/guides/element_value_types.html
+    if np.isscalar(tags): 
+        return get_values(ds, [tags])[0]
+            
+    row = []  
+    for tag in tags:
+        value = None
+
+        # If the tag is provided as string
+        if isinstance(tag, str):
+            if hasattr(ds, tag):
+                pydcm_value = ds[tag].value
+                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:
+                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:
+            value = derive_data_element(ds, tag)
+
+        row.append(value)
+    return row
+
+
+def set_values(ds, tags, values, VR=None, coords=None):
+
+    if np.isscalar(tags): 
+        tags = [tags]
+        values = [values]
+        VR = [VR]
+    elif VR is None:
+        VR = [None] * len(tags)
+
+    if coords is not None: # obsolete
+        tags += list(coords.keys())
+        values += list(coords.values())
+
+    for i, tag in enumerate(tags):
+                
+        if values[i] is None:
+            if isinstance(tag, str):
+                if hasattr(ds, tag):
+                    del ds[tag]
+            else: # hexadecimal tuple
+                if tag in ds:
+                    del ds[tag]
+
+        elif isinstance(tag, str):
+            if hasattr(ds, tag):
+                ds[tag].value = format_value(values[i], tag=tag)
+            else:
+                _add_new(ds, tag, values[i], VR=VR[i])
+
+        else: # hexadecimal tuple
+            if tag in ds:
+                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 value(ds, tags):
+    # Same as get_values but without VR lookup
+
+    # https://pydicom.github.io/pydicom/stable/guides/element_value_types.html
+    if np.isscalar(tags): 
+        return get_values(ds, [tags])[0]
+            
+    row = []  
+    for tag in tags:
+        value = None
+
+        # If the tag is provided as string
+        if isinstance(tag, str):
+
+            if hasattr(ds, tag):
+                value = to_set_type(ds[tag].value)
+
+        # If the tag is a tuple of hexadecimal values
+        else: 
+            if tag in ds:
+                value = to_set_type(ds[tag].value)
+
+        # If a tag is not present in the dataset, check if it can be derived
+        if value is None:
+            value = derive_data_element(ds, tag)
+
+        row.append(value)
+    return row
+
+
+def set_value(ds, tags, values):
+    # Same as set_values but without VR lookup
+    # This excludes new private tags - set those using add_private()
+    if np.isscalar(tags): 
+        tags = [tags]
+        values = [values]
+
+    for i, tag in enumerate(tags):
+                
+        if values[i] is None:
+            if isinstance(tag, str):
+                if hasattr(ds, tag):
+                    del ds[tag]
+            else: # hexadecimal tuple
+                if tag in ds:
+                    del ds[tag]
+
+        elif isinstance(tag, str):
+            if hasattr(ds, tag):
+                ds[tag].value = check_value(values[i], tag)
+            else:
+                add_new(ds, tag, values[i])
+
+        else: # hexadecimal tuple
+            if tag in ds:
+                ds[tag].value = check_value(values[i], tag)
+            else:
+                add_new(ds, tag, values[i])
+                
+    return ds
+
+
+def check_value(value, tag):
+
+    # If the change below is made (TM, DA, DT) then this needs to 
+    # convert those to string before setting
+
+    LO = [
+        'SeriesDescription',
+        'StudyDescription',
+    ]
+    TM = [
+        'AcquisitionTime',
+    ]
+
+    if tag in LO:
+        if len(value) > 64:
+            return value[-64:]
+    if tag in TM:
+        return seconds_to_str(value)
+    
+    return value
+
+
+def add_new(ds, tag, value):
+    if not isinstance(tag, pydicom.tag.BaseTag):
+        tag = pydicom.tag.Tag(tag)
+    if tag.is_private:
+        raise ValueError("if you want to add a private data element, use "
+                         "dataset.add_private()")
+   # Add a new data element
+    value_repr = pydicom.datadict.dictionary_VR(tag)
+    if value_repr == 'US or SS':
+        if value >= 0:
+            value_repr = 'US'
+        else:
+            value_repr = 'SS'
+    elif value_repr == 'OB or OW':
+        value_repr = 'OW'
+    ds.add_new(tag, value_repr, format_value(value, value_repr))
+
+def _add_new(ds, tag, value, VR='OW'):
+    if not isinstance(tag, pydicom.tag.BaseTag):
+        tag = pydicom.tag.Tag(tag)
+    if not tag.is_private: # Add a new data element
+        value_repr = pydicom.datadict.dictionary_VR(tag)
+        if value_repr == 'US or SS':
+            if value >= 0:
+                value_repr = 'US'
+            else:
+                value_repr = 'SS'
+        elif value_repr == 'OB or OW':
+            value_repr = '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, 'dbdicom ' + str(tag.group), create=True)
+        ds.add_new(tag, VR, format_value(value, VR))
+
+def format_value(value, VR=None, tag=None):
+
+    # If the change below is made (TM, DA, DT) then this needs to 
+    # convert those to string before setting
+
+    # Slow - dictionary lookup for every value write
+
+    if VR is None:
+        VR = pydicom.datadict.dictionary_VR(tag)
+
+    if VR == 'LO':
+        if len(value) > 64:
+            return value[-64:]
+            #return value[:64]
+    if VR == 'TM':
+        return seconds_to_str(value)
+    if VR == 'DA':
+        if not is_valid_dicom_date(value):
+            return '99991231'
+    
+    return value
+
+
+def is_valid_dicom_date(da_str: str) -> bool:
+    if not isinstance(da_str, str) or len(da_str) != 8 or not da_str.isdigit():
+        return False
+    try:
+        datetime.datetime.strptime(da_str, "%Y%m%d")
+        return True
+    except ValueError:
+        return False
+
+
+def to_set_type(value, VR=None):
+    """
+    Convert pydicom datatypes to the python datatypes used to set the parameter.
+    """
+    # Not a good idea to modify pydicom set/get values. confusing and requires extra VR lookups
+
+    if VR == 'TM':
+        # pydicom sometimes returns string values for TM data types
+        if isinstance(value, str):
+            return str_to_seconds(value)
+
+    if value.__class__.__name__ == 'MultiValue':
+        return [to_set_type(v, VR) for v in value]
+    if value.__class__.__name__ == 'PersonName':
+        return str(value)
+    if value.__class__.__name__ == 'Sequence':
+        return [ds for ds in value]
+    if value.__class__.__name__ == 'TM': 
+        return time_to_seconds(value) # return datetime.time
+    if value.__class__.__name__ == 'UID': 
+        return str(value) 
+    if value.__class__.__name__ == 'IS': 
+        return int(value)
+    if value.__class__.__name__ == 'DT': 
+        return datetime_to_str(value) # return datetime.datetime
+    if value.__class__.__name__ == 'DA':  # return datetime.date
+        return date_to_str(value)
+    if value.__class__.__name__ == 'DSfloat': 
+        return float(value)
+    if value.__class__.__name__ == 'DSdecimal': 
+        return int(value)
+    
+    return value
+
+
+def derive_data_element(ds, tag):
+    """Tags that are not required but can be derived from other required tags"""
+
+    if tag == 'SliceLocation' or tag == (0x0020, 0x1041):
+        if 'ImageOrientationPatient' in ds and 'ImagePositionPatient' in ds:
+            image_orientation = ds['ImageOrientationPatient'].value
+            image_position = ds['ImagePositionPatient'].value
+            row_cosine = np.array(image_orientation[:3])    
+            column_cosine = np.array(image_orientation[3:]) 
+            slice_cosine = np.cross(row_cosine, column_cosine)
+            return np.dot(np.array(image_position), slice_cosine)
+    # To be extended ad hoc with other tags that can be derived
+
+
+def add_private(ds, tag, value, VR):
+    if not isinstance(tag, pydicom.tag.BaseTag):
+        tag = pydicom.tag.Tag(tag)
+    if (tag.group, 0x0010) not in ds:
+        ds.private_block(tag.group, 'dbdicom ' + str(tag.group), create=True)
+    ds.add_new(tag, VR, format_value(value, VR))
+    
+
+def str_to_seconds(dicom_tm):
+    if dicom_tm is None:
+        return None
+    if dicom_tm == '':
+        return None
+    # dicom_tm is of the form 'HHMMSS.FFFFFF'
+    # Split the seconds into seconds and fractional seconds
+    seconds, fractional_seconds = dicom_tm.split('.')
+    # Convert the hours, minutes, and seconds to integers
+    hours = int(seconds[:2])
+    minutes = int(seconds[2:4])
+    seconds = int(seconds[4:])
+    # Convert the fractional seconds to a decimal
+    fractional_seconds = float('.' + fractional_seconds)
+    # Create a datetime object representing the time
+    seconds_since_midnight = (hours * 3600) + (minutes * 60) + seconds + fractional_seconds
+    return seconds_since_midnight
+
+def seconds_to_str(seconds_since_midnight):
+    # if not isinstance(seconds_since_midnight, float): 
+    #     return None
+    if seconds_since_midnight is None:
+        return None
+    seconds_since_midnight = float(seconds_since_midnight)
+    hours = math.floor(seconds_since_midnight/3600)
+    minutes = math.floor((seconds_since_midnight-hours*3600)/60)
+    seconds = math.floor(seconds_since_midnight-hours*3600-minutes*60)
+    fractional_seconds = round(seconds_since_midnight-hours*3600-minutes*60-seconds, 6)
+    hours = str(hours).zfill(2)
+    minutes = str(minutes).zfill(2)
+    seconds = str(seconds).zfill(2)
+    fractional_seconds = str(fractional_seconds)
+    fractional_seconds = fractional_seconds.split('.')
+    if len(fractional_seconds) == 2:
+        fractional_seconds = fractional_seconds[1].ljust(6,'0')
+    else:
+        fractional_seconds = '0'.ljust(6,'0')
+    return hours + minutes + seconds + '.' + fractional_seconds
+
+def time_to_seconds(tm):
+    if tm is None:
+        return None
+    hours = tm.hour
+    minutes = tm.minute
+    seconds = tm.second
+    fractional_seconds = tm.microsecond / 1000000.0
+    seconds_since_midnight = (hours * 3600) + (minutes * 60) + seconds + fractional_seconds
+    return seconds_since_midnight
+
+def seconds_to_time(seconds_since_midnight):
+    # if not isinstance(seconds_since_midnight, float): 
+    #     return None
+    if seconds_since_midnight is None:
+        return None
+    seconds_since_midnight = float(seconds_since_midnight)
+    hours = math.floor(seconds_since_midnight/3600)
+    minutes = math.floor((seconds_since_midnight-hours*3600)/60)
+    seconds = math.floor(seconds_since_midnight-hours*3600-minutes*60)
+    fractional_seconds = round(seconds_since_midnight-hours*3600-minutes*60-seconds, 6)
+    microseconds = fractional_seconds*1000000.0
+    return datetime.time(int(hours), int(minutes), int(seconds), int(microseconds))
+
+def time_to_str(tm):
+    if tm is None:
+        return None
+    hours = tm.hour
+    minutes = tm.minute
+    seconds = tm.second
+    fractional_seconds = tm.microsecond / 1000000.0   
+    hours = str(hours).zfill(2)
+    minutes = str(minutes).zfill(2)
+    seconds = str(seconds).zfill(2)
+    fractional_seconds = str(fractional_seconds)
+    _, fractional_seconds = fractional_seconds.split('.')
+    fractional_seconds = fractional_seconds.ljust(6,'0')
+    return hours + minutes + seconds + '.' + fractional_seconds 
+
+def date_to_str(tm):
+    if tm is None:
+        return None
+    year = str(tm.year).rjust(4, '0')
+    month = str(tm.month).rjust(2, '0')
+    day = str(tm.day).rjust(2, '0')
+    return year + month + day
+
+def datetime_to_str(dt):
+    if dt is None:
+        return None
+    date = date_to_str(dt.date())
+    time = time_to_str(dt.time())
+    return date + time

{dbdicom-0.3.7.dist-info → dbdicom-0.3.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dbdicom
-Version: 0.3.7
+Version: 0.3.9
 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://openmiblab.github.io/dbdicom/

{dbdicom-0.3.7.dist-info → dbdicom-0.3.9.dist-info}/RECORD

@@ -1,9 +1,9 @@
 dbdicom/__init__.py,sha256=dW5aezonmMc_41Dp1PuYmXQlr307RkyJxsJuetkpWso,87
-dbdicom/api.py,sha256=lUNLQo3aAAIFVF7IMccNhXAlbf1hMNTU9gHibdfbKcI,14135
+dbdicom/api.py,sha256=oIvTktChBoEl4z0NXHMPVn2ZnPxUUXtZahwrIM7zfx0,14426
 dbdicom/const.py,sha256=BqBiRRjeiSqDr1W6YvaayD8WKCjG4Cny2NT0GeLM6bI,4269
-dbdicom/database.py,sha256=_LUbH7gc9l7j_63AC71DjwxgTUwbEjHSy5kuvRw75Hw,4764
-dbdicom/dataset.py,sha256=kbswoVE3-Wtu0uwcSW319KzpdWx5fZphfKxizxJePzc,22773
-dbdicom/dbd.py,sha256=yvj4PRj4gP1Qmh0VhibOrZ1oxy9v9qM9iOV0L6C_Ryw,38261
+dbdicom/database.py,sha256=mkYQAAf9fETzUhSQflQFp7RQUBdPlSlDty9nn6KY1jQ,4771
+dbdicom/dataset.py,sha256=2_MB7t9nMzTyq6sEhbu__MjU1VEnO0MdZuhzZK13a1I,14433
+dbdicom/dbd.py,sha256=AP3BGcwWXnHwSov9kcm4CdWzgIDKod9WiGFNOf2aHLE,39799
 dbdicom/register.py,sha256=_NyNbOEAN_hkwjxupNpr9F5DWUwARCsci8knK41-EsA,13931
 dbdicom/external/__init__.py,sha256=XNQqfspyf6vFGedXlRKZsUB8k8E-0W19Uamwn8Aioxo,316
 dbdicom/external/__pycache__/__init__.cpython-311.pyc,sha256=pXAQ35ixd92fm6YcuHgzR1t6RcASQ-cHhU1wOA5b8sw,542
@@ -35,7 +35,7 @@ dbdicom/external/dcm4che/lib/windows-x86/clib_jiio_util.dll,sha256=wi4yyrI1gTRo_
 dbdicom/external/dcm4che/lib/windows-x86/opencv_java.dll,sha256=QanyzLy0Cd79-aOVPwOcXwikUYeutne0Au-Um91_B4M,8505856
 dbdicom/external/dcm4che/lib/windows-x86-64/opencv_java.dll,sha256=TmjW2SbG4MR3GQ95T8xCVVDLgsdKukgaHBPUvWkfXp8,11039232
 dbdicom/sop_classes/ct_image.py,sha256=16PNv_0e1_7cfxE12JWlx5YQeaTAQVzwtXTjxs3aonk,2812
-dbdicom/sop_classes/enhanced_mr_image.py,sha256=13j4EGXniBpJxpzzL3Xa4y3g5OKhMd5Ct7cjPGOYQY4,35496
+dbdicom/sop_classes/enhanced_mr_image.py,sha256=8JWg8I86YtYBKYgiZdsA-OHPFS6_1GpW4lYCudKMAI4,33379
 dbdicom/sop_classes/mr_image.py,sha256=1biIw7R26Fc38FAeSlWxd29VO17e8cEQdDIdLbeXTzw,10959
 dbdicom/sop_classes/parametric_map.py,sha256=2OKBuC2bo03OEpKqimQS-nVGFp1cKRPYwVgmDGVf1JU,12288
 dbdicom/sop_classes/secondary_capture.py,sha256=wgNRX8qyhV7HR7Jq2tQWPPuGpiRzYl6qPOgK6qFbPUc,4541
@@ -45,10 +45,10 @@ dbdicom/sop_classes/xray_angiographic_image.py,sha256=nWysCGaEWKVNItnOgyJfcGMpS3
 dbdicom/utils/arrays.py,sha256=cZo6hKk-pg_e2WCs9vxW9dxX04gmH3EwSZKFX1n8pq4,1451
 dbdicom/utils/dcm4che.py,sha256=Vxq8NYWWK3BuqJkzhBQ89oMqzJlnxqTxgsgTo_Frznc,2317
 dbdicom/utils/files.py,sha256=qhWNJqeWnRjDNbERpC6Mz962_TW9mFdvd2lnBbK3xt4,2259
-dbdicom/utils/image.py,sha256=qsU_wOdleZCqU5g7LSp8OXKmoG109NauYx7wad_ZQ7Q,3839
-dbdicom/utils/variables.py,sha256=vUh5cDnmCft5hoXDYXUvfkg5Cy5WlgMAogU38Y_BKRo,5753
-dbdicom-0.3.7.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-dbdicom-0.3.7.dist-info/METADATA,sha256=kSsHB7e2v_JdenBx6j9hewbYIOsPucwANgvL_BZEjXw,1030
-dbdicom-0.3.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dbdicom-0.3.7.dist-info/top_level.txt,sha256=nJWxXg4YjD6QblfmhrzTMXcr8FSKNc0Yk-CAIDUsYkQ,8
-dbdicom-0.3.7.dist-info/RECORD,,
+dbdicom/utils/image.py,sha256=zRM1O0bxPp-qpf3Iv_GRS1omKaMN1SgSkAwufWLJ0Fk,3863
+dbdicom/utils/pydicom_dataset.py,sha256=XM3EERsCWPlEaUzVaFQSbPNiNbEGwxIbf-sUKKf_YxA,12755
+dbdicom-0.3.9.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+dbdicom-0.3.9.dist-info/METADATA,sha256=aNhxdZoSLOvA-OIJOPGsL-BPWjUWFoNNJd2ICWjZUGk,1030
+dbdicom-0.3.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dbdicom-0.3.9.dist-info/top_level.txt,sha256=nJWxXg4YjD6QblfmhrzTMXcr8FSKNc0Yk-CAIDUsYkQ,8
+dbdicom-0.3.9.dist-info/RECORD,,

dbdicom/utils/variables.py

@@ -1,161 +0,0 @@
-import math
-import datetime
-
-def str_to_seconds(dicom_tm):
-    if dicom_tm is None:
-        return None
-    if dicom_tm == '':
-        return None
-    # dicom_tm is of the form 'HHMMSS.FFFFFF'
-    # Split the seconds into seconds and fractional seconds
-    seconds, fractional_seconds = dicom_tm.split('.')
-    # Convert the hours, minutes, and seconds to integers
-    hours = int(seconds[:2])
-    minutes = int(seconds[2:4])
-    seconds = int(seconds[4:])
-    # Convert the fractional seconds to a decimal
-    fractional_seconds = float('.' + fractional_seconds)
-    # Create a datetime object representing the time
-    seconds_since_midnight = (hours * 3600) + (minutes * 60) + seconds + fractional_seconds
-    return seconds_since_midnight
-
-def seconds_to_str(seconds_since_midnight):
-    # if not isinstance(seconds_since_midnight, float): 
-    #     return None
-    if seconds_since_midnight is None:
-        return None
-    seconds_since_midnight = float(seconds_since_midnight)
-    hours = math.floor(seconds_since_midnight/3600)
-    minutes = math.floor((seconds_since_midnight-hours*3600)/60)
-    seconds = math.floor(seconds_since_midnight-hours*3600-minutes*60)
-    fractional_seconds = round(seconds_since_midnight-hours*3600-minutes*60-seconds, 6)
-    hours = str(hours).zfill(2)
-    minutes = str(minutes).zfill(2)
-    seconds = str(seconds).zfill(2)
-    fractional_seconds = str(fractional_seconds)
-    fractional_seconds = fractional_seconds.split('.')
-    if len(fractional_seconds) == 2:
-        fractional_seconds = fractional_seconds[1].ljust(6,'0')
-    else:
-        fractional_seconds = '0'.ljust(6,'0')
-    return hours + minutes + seconds + '.' + fractional_seconds
-
-def time_to_seconds(tm):
-    if tm is None:
-        return None
-    hours = tm.hour
-    minutes = tm.minute
-    seconds = tm.second
-    fractional_seconds = tm.microsecond / 1000000.0
-    seconds_since_midnight = (hours * 3600) + (minutes * 60) + seconds + fractional_seconds
-    return seconds_since_midnight
-
-def seconds_to_time(seconds_since_midnight):
-    # if not isinstance(seconds_since_midnight, float): 
-    #     return None
-    if seconds_since_midnight is None:
-        return None
-    seconds_since_midnight = float(seconds_since_midnight)
-    hours = math.floor(seconds_since_midnight/3600)
-    minutes = math.floor((seconds_since_midnight-hours*3600)/60)
-    seconds = math.floor(seconds_since_midnight-hours*3600-minutes*60)
-    fractional_seconds = round(seconds_since_midnight-hours*3600-minutes*60-seconds, 6)
-    microseconds = fractional_seconds*1000000.0
-    return datetime.time(int(hours), int(minutes), int(seconds), int(microseconds))
-
-def time_to_str(tm):
-    if tm is None:
-        return None
-    hours = tm.hour
-    minutes = tm.minute
-    seconds = tm.second
-    fractional_seconds = tm.microsecond / 1000000.0   
-    hours = str(hours).zfill(2)
-    minutes = str(minutes).zfill(2)
-    seconds = str(seconds).zfill(2)
-    fractional_seconds = str(fractional_seconds)
-    _, fractional_seconds = fractional_seconds.split('.')
-    fractional_seconds = fractional_seconds.ljust(6,'0')
-    return hours + minutes + seconds + '.' + fractional_seconds 
-
-def date_to_str(tm):
-    if tm is None:
-        return None
-    year = str(tm.year).rjust(4, '0')
-    month = str(tm.month).rjust(2, '0')
-    day = str(tm.day).rjust(2, '0')
-    return year + month + day
-
-def datetime_to_str(dt):
-    if dt is None:
-        return None
-    date = date_to_str(dt.date())
-    time = time_to_str(dt.time())
-    return date + time
-
-
-def test_all_conversions(sec, dcm, tim, date, date_str, dt, dt_str):
-
-    assert seconds_to_str(None) is None
-    assert str_to_seconds(dcm) == sec
-    assert seconds_to_str(sec) == dcm
-    assert str_to_seconds(seconds_to_str(sec)) == sec
-    assert seconds_to_str(str_to_seconds(dcm)) == dcm
-    assert time_to_seconds(tim) == sec
-    assert seconds_to_time(sec) == tim
-    assert time_to_seconds(seconds_to_time(sec)) == sec
-    assert seconds_to_time(time_to_seconds(tim)) == tim
-    assert date_to_str(date) == date_str
-    assert time_to_str(tim) == dcm
-    assert datetime_to_str(dt) == dt_str
-    
-
-def test_module():
-
-    sec = 13*60*60 + 12*60 + 40 + 0.03
-    dcm = '131240.030000'
-    tim = datetime.time(13, 12, 40, 30000)
-    date = datetime.date(2023, 3, 1)
-    date_str = '20230301'
-    dt = datetime.datetime(2023, 3, 1, 13, 12, 40, 30000)
-    dt_str = '20230301131240.030000'
-
-    test_all_conversions(sec, dcm, tim, date, date_str, dt, dt_str)
-
-    sec = 7*60*60 + 12*60 + 40 + 0.03
-    dcm = '071240.030000'
-    tim = datetime.time(7, 12, 40, 30000)
-    date = datetime.date(2023, 3, 1)
-    date_str = '20230301'
-    dt = datetime.datetime(2023, 3, 1, 7, 12, 40, 30000)
-    dt_str = '20230301071240.030000'
-
-    test_all_conversions(sec, dcm, tim, date, date_str, dt, dt_str)
-
-    sec = 7*60*60 + 3*60 + 40 + 0.03
-    dcm = '070340.030000'
-    tim = datetime.time(7, 3, 40, 30000)
-    date = datetime.date(2023, 3, 1)
-    date_str = '20230301'
-    dt = datetime.datetime(2023, 3, 1, 7, 3, 40, 30000)
-    dt_str = '20230301070340.030000'
-
-    test_all_conversions(sec, dcm, tim, date, date_str, dt, dt_str)
-
-    sec = 7*60*60 + 3*60 + 4 + 0.03
-    dcm = '070304.030000'
-    tim = datetime.time(7, 3, 4, 30000)
-    date = datetime.date(2023, 3, 1)
-    date_str = '20230301'
-    dt = datetime.datetime(2023, 3, 1, 7, 3, 4, 30000)
-    dt_str = '20230301070304.030000'   
-
-    test_all_conversions(sec, dcm, tim, date, date_str, dt, dt_str) 
-
-    print('dbdicom.utils.variables passed all tests')
-
-
-if __name__ == "__main__":
-
-    test_module()
-