dbdicom 0.3.12__py3-none-any.whl → 0.3.13__py3-none-any.whl

dbdicom/dataset.py

@@ -85,8 +85,8 @@ def write(ds, file, status=None):
     dir = os.path.dirname(file)
     if not os.path.exists(dir):
         os.makedirs(dir)
-    ds.save_as(file, write_like_original=False) # deprecated
-    # ds.save_as(file, enforce_file_format=True)
+    # ds.save_as(file, write_like_original=False) # deprecated
+    pydicom.dcmwrite(file, ds, enforce_file_format=True)
 
 
 def codify(source_file, save_file, **kwargs):

dbdicom/dbd.py

@@ -70,8 +70,6 @@ class DataBaseDicom():
         # self._split_series()
         return self
 
-    
-
     def delete(self, entity, not_exists_ok=False):
         """Delete a DICOM entity from the database
 
@@ -729,7 +727,7 @@ class DataBaseDicom():
                 else:
                     to_entity[-1] = (to_entity[-1] + '_copy', 0)
                 while to_entity in self.series():
-                    to_entity[-1][1] += 1
+                    to_entity[-1] = (to_entity[-1][0], to_entity[-1][1] + 1)
             if len(to_entity) != 4:
                 raise ValueError(
                     f"Cannot copy series {from_entity} to series {to_entity}. "

dbdicom/register.py

@@ -79,6 +79,7 @@ def index(dbtree, entity):
                     for sr in sorted(st['series'], key=lambda sr: sr['SeriesNumber']):
                         idx += list(sr['instances'].values())
                 return idx
+        raise ValueError(f'Patient {patient_id} not found')
     elif len(entity)==3:
         study_uid = uid(dbtree, entity)
         idx = []
@@ -88,6 +89,7 @@ def index(dbtree, entity):
                     for sr in sorted(st['series'], key=lambda sr: sr['SeriesNumber']):
                         idx += list(sr['instances'].values())
                     return idx
+        raise ValueError(f'Study {study_uid} not found')
     elif len(entity)==4:
         series_uid = uid(dbtree, entity)
         for pt in sorted(dbtree, key=lambda pt: pt['PatientID']):
@@ -95,6 +97,7 @@ def index(dbtree, entity):
                 for sr in sorted(st['series'], key=lambda sr: sr['SeriesNumber']):
                     if sr['SeriesInstanceUID'] == series_uid:
                         return list(sr['instances'].values())
+        raise ValueError(f'Series {series_uid} not found')
                     
 def remove(dbtree, entity):
     if len(entity)==2:

{dbdicom-0.3.12.dist-info → dbdicom-0.3.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dbdicom
-Version: 0.3.12
+Version: 0.3.13
 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.12.dist-info → dbdicom-0.3.13.dist-info}/RECORD

@@ -2,9 +2,9 @@ dbdicom/__init__.py,sha256=dW5aezonmMc_41Dp1PuYmXQlr307RkyJxsJuetkpWso,87
 dbdicom/api.py,sha256=CeEhKgwZiCSm-eIwyiJgPdyQGGpuLCTuR7B19dvo6Zs,15713
 dbdicom/const.py,sha256=BqBiRRjeiSqDr1W6YvaayD8WKCjG4Cny2NT0GeLM6bI,4269
 dbdicom/database.py,sha256=mkYQAAf9fETzUhSQflQFp7RQUBdPlSlDty9nn6KY1jQ,4771
-dbdicom/dataset.py,sha256=WVYo4mmERpzp4P0Z7BdsYL6FFUs6T7xdMRdLFp6Lxos,14866
-dbdicom/dbd.py,sha256=J3aSQmf_Uyd2y9yYS-T6tR0SfLz2tF4aaGqbjwZOK-w,45819
-dbdicom/register.py,sha256=5yXnTbRUu8rYJqeIbSv5SiRf2E4BZ0JZyvKm_xvaXZQ,14944
+dbdicom/dataset.py,sha256=cZFiZr-EySFwFHzchZkDzcKF8ooC5qOa0Dmlwkt1CCA,14876
+dbdicom/dbd.py,sha256=iEw1phzkQHhDpXG9hdpyy91z691HVCMimmmvbrppB9M,45846
+dbdicom/register.py,sha256=pnfFgD-Mki4A7MCoYX6_hBRh3ZNRW5yXILeZRr4lZuc,15123
 dbdicom/external/__init__.py,sha256=XNQqfspyf6vFGedXlRKZsUB8k8E-0W19Uamwn8Aioxo,316
 dbdicom/external/__pycache__/__init__.cpython-311.pyc,sha256=pXAQ35ixd92fm6YcuHgzR1t6RcASQ-cHhU1wOA5b8sw,542
 dbdicom/external/dcm4che/README.md,sha256=0aAGRs36W3_0s5LzWHRGf_tqariS_JP4iJggaxnD4Xw,8987
@@ -47,8 +47,8 @@ dbdicom/utils/dcm4che.py,sha256=Vxq8NYWWK3BuqJkzhBQ89oMqzJlnxqTxgsgTo_Frznc,2317
 dbdicom/utils/files.py,sha256=qhWNJqeWnRjDNbERpC6Mz962_TW9mFdvd2lnBbK3xt4,2259
 dbdicom/utils/image.py,sha256=zRM1O0bxPp-qpf3Iv_GRS1omKaMN1SgSkAwufWLJ0Fk,3863
 dbdicom/utils/pydicom_dataset.py,sha256=XM3EERsCWPlEaUzVaFQSbPNiNbEGwxIbf-sUKKf_YxA,12755
-dbdicom-0.3.12.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-dbdicom-0.3.12.dist-info/METADATA,sha256=ETJOB2zW22PwtgvUmkivEu7fQoaxWiCxHknyX3DGJyI,1031
-dbdicom-0.3.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dbdicom-0.3.12.dist-info/top_level.txt,sha256=nJWxXg4YjD6QblfmhrzTMXcr8FSKNc0Yk-CAIDUsYkQ,8
-dbdicom-0.3.12.dist-info/RECORD,,
+dbdicom-0.3.13.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+dbdicom-0.3.13.dist-info/METADATA,sha256=kn-mtLWEdakDT6hvBka_YNJNyBxFzKJxyP73_xg5gpg,1031
+dbdicom-0.3.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dbdicom-0.3.13.dist-info/top_level.txt,sha256=nJWxXg4YjD6QblfmhrzTMXcr8FSKNc0Yk-CAIDUsYkQ,8
+dbdicom-0.3.13.dist-info/RECORD,,