dbdicom 0.2.1__py3-none-any.whl → 0.2.4__py3-none-any.whl

dbdicom/external/dcm4che/bin/emf2sf

@@ -1,57 +1,57 @@
-#!/bin/sh
-# -------------------------------------------------------------------------
-# emf2sf  Launcher
-# -------------------------------------------------------------------------
-
-MAIN_CLASS=org.dcm4che3.tool.emf2sf.Emf2sf
-MAIN_JAR=dcm4che-tool-emf2sf-5.23.1.jar
-
-DIRNAME="`dirname "$0"`"
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false;
-case "`uname`" in
-    CYGWIN*)
-        cygwin=true
-        ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin ; then
-    [ -n "$DCM4CHE_HOME" ] &&
-        DCM4CHE_HOME=`cygpath --unix "$DCM4CHE_HOME"`
-    [ -n "$JAVA_HOME" ] &&
-        JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Setup DCM4CHE_HOME
-if [ "x$DCM4CHE_HOME" = "x" ]; then
-    DCM4CHE_HOME=`cd "$DIRNAME"/..; pwd`
-fi
-
-# Setup the JVM
-if [ "x$JAVA_HOME" != "x" ]; then
-    JAVA=$JAVA_HOME/bin/java
-else
-    JAVA="java"
-fi
-
-# Setup the classpath
-CP="$DCM4CHE_HOME/etc/emf2sf/"
-CP="$CP:$DCM4CHE_HOME/lib/$MAIN_JAR"
-CP="$CP:$DCM4CHE_HOME/lib/dcm4che-core-5.23.1.jar"
-CP="$CP:$DCM4CHE_HOME/lib/dcm4che-emf-5.23.1.jar"
-CP="$CP:$DCM4CHE_HOME/lib/dcm4che-tool-common-5.23.1.jar"
-CP="$CP:$DCM4CHE_HOME/lib/slf4j-api-1.7.30.jar"
-CP="$CP:$DCM4CHE_HOME/lib/slf4j-log4j12-1.7.30.jar"
-CP="$CP:$DCM4CHE_HOME/lib/log4j-1.2.17.jar"
-CP="$CP:$DCM4CHE_HOME/lib/commons-cli-1.4.jar"
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
-    JAVA=`cygpath --path --windows "$JAVA"`
-    CP=`cygpath --path --windows "$CP"`
-fi
-
-# Execute the JVM
-exec "$JAVA" $JAVA_OPTS -cp "$CP" $MAIN_CLASS "$@"
+#!/bin/sh
+# -------------------------------------------------------------------------
+# emf2sf  Launcher
+# -------------------------------------------------------------------------
+
+MAIN_CLASS=org.dcm4che3.tool.emf2sf.Emf2sf
+MAIN_JAR=dcm4che-tool-emf2sf-5.23.1.jar
+
+DIRNAME="`dirname "$0"`"
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false;
+case "`uname`" in
+    CYGWIN*)
+        cygwin=true
+        ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+    [ -n "$DCM4CHE_HOME" ] &&
+        DCM4CHE_HOME=`cygpath --unix "$DCM4CHE_HOME"`
+    [ -n "$JAVA_HOME" ] &&
+        JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Setup DCM4CHE_HOME
+if [ "x$DCM4CHE_HOME" = "x" ]; then
+    DCM4CHE_HOME=`cd "$DIRNAME"/..; pwd`
+fi
+
+# Setup the JVM
+if [ "x$JAVA_HOME" != "x" ]; then
+    JAVA=$JAVA_HOME/bin/java
+else
+    JAVA="java"
+fi
+
+# Setup the classpath
+CP="$DCM4CHE_HOME/etc/emf2sf/"
+CP="$CP:$DCM4CHE_HOME/lib/$MAIN_JAR"
+CP="$CP:$DCM4CHE_HOME/lib/dcm4che-core-5.23.1.jar"
+CP="$CP:$DCM4CHE_HOME/lib/dcm4che-emf-5.23.1.jar"
+CP="$CP:$DCM4CHE_HOME/lib/dcm4che-tool-common-5.23.1.jar"
+CP="$CP:$DCM4CHE_HOME/lib/slf4j-api-1.7.30.jar"
+CP="$CP:$DCM4CHE_HOME/lib/slf4j-log4j12-1.7.30.jar"
+CP="$CP:$DCM4CHE_HOME/lib/log4j-1.2.17.jar"
+CP="$CP:$DCM4CHE_HOME/lib/commons-cli-1.4.jar"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+    JAVA=`cygpath --path --windows "$JAVA"`
+    CP=`cygpath --path --windows "$CP"`
+fi
+
+# Execute the JVM
+exec "$JAVA" $JAVA_OPTS -cp "$CP" $MAIN_CLASS "$@"

dbdicom/manager.py

@@ -423,17 +423,33 @@ class Manager():
         #return [id for id in uids if function(self.get_values(attr, uid=id), vals)]
 
 
-    def filter_instances(self, df, **kwargs):
+    def filter_instances(self, df, select={}, **filters):
         df.dropna(inplace=True)
-        if not kwargs:
+        filters = {**select, **filters}
+        if filters == {}:
             return df
-        vals = list(kwargs.values())
-        attr = list(kwargs.keys())
-        keys = [key for key in df.index if self.get_values(attr, [key]) == vals]
+        vals = list(filters.values())
+        attr = list(filters.keys())
+        # keys = [key for key in df.index if self.get_values(attr, [key]) == vals]
+        keys = []
+        for key in df.index:
+            v = self.get_values(attr, [key])
+            append = True
+            for i, vi in enumerate(v):
+                if isinstance(vals[i], np.ndarray):
+                    if vi not in vals[i]:
+                        append = False
+                        break
+                else:
+                    if vi != vals[i]:
+                        append = False
+                        break
+            if append:
+                keys.append(key)
         return df[keys]
 
 
-    def instances(self, uid=None, keys=None, sort=True, sortby=None, images=False, **kwargs):
+    def instances(self, uid=None, keys=None, sort=True, sortby=None, images=False, select={}, **filters):
         if keys is None:
             keys = self.keys(uid)
         if sort:
@@ -444,7 +460,7 @@ class Manager():
             df = df.SOPInstanceUID
         else:
             df = self.register.loc[keys,'SOPInstanceUID']
-        df = self.filter_instances(df, **kwargs)
+        df = self.filter_instances(df, select=select, **filters)
         if images == True:
             keys = [key for key in df.index if self.get_values('Rows', [key]) is not None]
             df = df[keys]
@@ -978,6 +994,16 @@ class Manager():
             empty = df[df.values == None].index
             if len(empty) == 1:
                 self.delete_row(empty[0])
+                # Return new parent key
+                if missing == 'SOPInstanceUID':
+                    return self.keys(series=parent_uid)[0]
+                if missing == 'SeriesInstanceUID':
+                    return self.keys(study=parent_uid)[0]
+                if missing == 'StudyInstanceUID':
+                    return self.keys(patient=parent_uid)[0]
+                if missing == 'PatientID':
+                    return self.register.index[0]
+        return parent_key
 
     
     def update_row_data(self, key, data):
@@ -1069,6 +1095,7 @@ class Manager():
             key = self.new_row(data)  # Study with existing series
         return data[2], key
 
+
     
     def new_instance(self, parent=None, dataset=None, key=None, **kwargs):
 
@@ -1132,12 +1159,12 @@ class Manager():
 
         data = self.register.loc[key, self.columns]
         data[4] = ds.SOPClassUID
+        data[11:] = ds.get_values(self.columns[11:])
         key = self.update_row_data(key, data)
-        ds.set_values(self.columns, data)
+        ds.set_values(self.columns[:11], data[:11]) 
         self.dataset[key] = ds
         return key
 
-        
     def set_dataset(self, uid, dataset, keys=None):
 
         if keys is None:
@@ -1145,10 +1172,9 @@ class Manager():
         else:
             parent_keys = keys
 
-        # LOOKUP!!!
-        # ELIMINATE
-        if self.type(uid, parent_keys[0]) == 'Instance': 
-            self.set_instance_dataset(uid, dataset, parent_keys[0])
+        parent_key = parent_keys[0]
+        if self.type(uid, parent_key) == 'Instance': 
+            self.set_instance_dataset(uid, dataset, parent_key)
             return
 
         if not isinstance(dataset, list):
@@ -1177,10 +1203,11 @@ class Manager():
                     data[10] = 1
                 else:
                     data[10] = 1 + max(nrs)
+                data[11:] = ds.get_values(self.columns[11:]) # added 27/07/23
                 
                 # Add to database in memory as a new row
                 key = self.new_row(data)
-                ds.set_values(self.columns, data)
+                ds.set_values(self.columns[:11], data[:11]) # modified 27/07/23
                 self.dataset[key] = ds
 
             else: # If the instance is already in the object
@@ -1188,11 +1215,13 @@ class Manager():
                 key = parent_keys[ind]
                 data = self.value(key, self.columns)
                 data[4] = ds.SOPClassUID
+                data[11:] = ds.get_values(self.columns[11:]) # added 27/07/23
                 key = self.update_row_data(key, data)
+                ds.set_values(self.columns[:11], data[:11]) # added 27/07/23
                 self.dataset[key] = ds
 
         # If the series is empty and new instances have been added then delete the row  
-        self.drop_placeholder_row(parent_keys[0], missing='SOPInstanceUID')
+        parent_key = self.drop_placeholder_row(parent_key, missing='SOPInstanceUID')
 
 
 
@@ -1245,7 +1274,8 @@ class Manager():
     def copy_instance_to_series(self, instance_key, target_keys, tmp, **kwargs):
         """Copy instances to another series"""
 
-        attributes, values = self.series_header(target_keys[0])
+        new_parent_key = target_keys[0]
+        attributes, values = self.series_header(new_parent_key)
         self.append_kwargs(kwargs, attributes, values)
 
         n = self.register.loc[target_keys,'InstanceNumber'].values
@@ -1258,7 +1288,7 @@ class Manager():
 
         if ds is None:
             row = self.value(instance_key, self.columns).tolist()
-            row = self.copy_series_data(target_keys[0], row)
+            row = self.copy_series_data(new_parent_key, row)
             row[3] = new_instance
             row[10] = 1 + max_number
             for val in kwargs:
@@ -1275,7 +1305,7 @@ class Manager():
                 ds.write(self.filepath(new_key), self.status)
             row = ds.get_values(self.columns)
 
-        self.drop_placeholder_row(target_keys[0], missing='SOPInstanceUID')
+        new_parent_key = self.drop_placeholder_row(new_parent_key, missing='SOPInstanceUID')
         self.new_row(row, new_key)
         
         return new_instance
@@ -1291,8 +1321,8 @@ class Manager():
         """Copy instances to another series"""
 
         target_keys = self.keys(series=target)
-
-        attributes, values = self.series_header(target_keys[0])
+        new_parent_key = target_keys[0]
+        attributes, values = self.series_header(new_parent_key)
         self.append_kwargs(kwargs, attributes, values)
 
         max_number = self.new_instance_number(target)
@@ -1309,7 +1339,7 @@ class Manager():
             ds = self.get_dataset(instance_uid, [key])
             if ds is None:
                 row = self.value(key, self.columns).tolist()
-                row = self.copy_series_data(target_keys[0], row)
+                row = self.copy_series_data(new_parent_key, row)
                 row[3] = new_instances[i]
                 row[10] = i + max_number
                 for val in kwargs:
@@ -1330,7 +1360,7 @@ class Manager():
             self.new_row(row, new_key)
 
         # If the series is empty and new instances have been added, then delete the row 
-        self.drop_placeholder_row(target_keys[0], missing='SOPInstanceUID')
+        new_parent_key = self.drop_placeholder_row(new_parent_key, missing='SOPInstanceUID')
 
         if len(keys) > 1:
             self.status.hide()
@@ -1367,7 +1397,10 @@ class Manager():
             series_keys = self.keys(series=series)
             for k, key in enumerate(series_keys):
 
-                msg = 'Copying series ' + self.value(key, 'SeriesDescription')
+                desc = self.value(key, 'SeriesDescription')
+                if desc is None:
+                    desc = 'Unknown'
+                msg = 'Copying series ' + desc
                 msg += ' (' + str(s+1) + '/' + str(len(all_series)) + ')'
                 self.status.progress(k+1, len(series_keys), msg)
 
@@ -1410,7 +1443,7 @@ class Manager():
 
         # If the study is empty and new series have been added
         # then delete the row 
-        self.drop_placeholder_row(target_key, missing='SeriesInstanceUID')
+        target_key = self.drop_placeholder_row(target_key, missing='SeriesInstanceUID')
         self.status.hide()
 
         if len(new_series) == 1:
@@ -1476,7 +1509,7 @@ class Manager():
                     self.new_row(row, new_key)
 
         # If the patient is empty and new studies have been added, then delete the row 
-        self.drop_placeholder_row(target_key, missing='StudyInstanceUID')
+        target_key = self.drop_placeholder_row(target_key, missing='StudyInstanceUID')
 
         if len(new_studies) == 1:
             return new_studies[0]
@@ -1577,8 +1610,8 @@ class Manager():
         if target_keys == []:
             msg = 'Moving data to a series that does not exist in the database'
             raise ValueError(msg)
-
-        attributes, values = self.series_header(target_keys[0])
+        new_parent_key = target_keys[0]
+        attributes, values = self.series_header(new_parent_key)
         self.append_kwargs(kwargs, attributes, values)
 
         n = self.value(target_keys, 'InstanceNumber')
@@ -1596,7 +1629,7 @@ class Manager():
 
             if ds is None:
                 row = self.value(key, self.columns).tolist()
-                row = self.copy_series_data(target_keys[0], row)
+                row = self.copy_series_data(new_parent_key, row)
                 row[10] = i + 1 + max_number
                 for val in kwargs:
                     if val in self._descriptives:
@@ -1606,7 +1639,7 @@ class Manager():
                 self.set_dataset_values(ds, key, attributes+['InstanceNumber'], values+[i+1+max_number])
 
         # If the series is empty and new instances have been added, then delete the row 
-        self.drop_placeholder_row(target_keys[0], 'SOPInstanceUID')
+        new_parent_key = self.drop_placeholder_row(new_parent_key, 'SOPInstanceUID')
 
         if len(keys) == 1:
             return self.value(keys, 'SOPInstanceUID')
@@ -1639,8 +1672,8 @@ class Manager():
         """Copy series to another study"""
 
         target_keys = self.keys(study=target)
-
-        attributes, values = self.study_header(target_keys[0])
+        new_parent_key = target_keys[0]
+        attributes, values = self.study_header(new_parent_key)
         self.append_kwargs(kwargs, attributes, values)
 
         n = self.value(target_keys, 'SeriesNumber')
@@ -1664,7 +1697,7 @@ class Manager():
                 # If the instance is empty, just replace study data in the register.
                 if ds is None:
                     row = self.value(key, self.columns).tolist()
-                    row = self.copy_study_data(target_keys[0], row)
+                    row = self.copy_study_data(new_parent_key, row)
                     row[9] = new_number
                     for val in kwargs:
                         if val in self._descriptives:
@@ -1675,7 +1708,7 @@ class Manager():
                 else:
                     self.set_dataset_values(ds, key, attributes+['SeriesNumber'], values+[new_number])
 
-        self.drop_placeholder_row(target_keys[0], 'SeriesInstanceUID')
+        new_parent_key = self.drop_placeholder_row(new_parent_key, 'SeriesInstanceUID')
 
         if len(all_series) == 1:
             return all_series[0]
@@ -1705,7 +1738,8 @@ class Manager():
         """Copy series to another study"""
 
         target_keys = self.keys(patient=target)
-        attributes, values = self.patient_header(target_keys[0])
+        new_parent_key = target_keys[0]
+        attributes, values = self.patient_header(new_parent_key)
         self.append_kwargs(kwargs, attributes, values)
         all_studies = self.studies(uid)
 
@@ -1726,7 +1760,7 @@ class Manager():
                     # If the instance is empty, just update the register.
                     if ds is None:
                         row = self.value(key, self.columns).tolist()
-                        row = self.copy_patient_data(target_keys[0], row)
+                        row = self.copy_patient_data(new_parent_key, row)
                         for val in kwargs:
                             if val in self._descriptives:
                                 row[self._descriptives[val]] = kwargs[val]
@@ -1736,7 +1770,7 @@ class Manager():
                     else:
                         self.set_dataset_values(ds, key, attributes, values)
 
-            self.drop_placeholder_row(target_keys[0], 'StudyInstanceUID')
+            new_parent_key = self.drop_placeholder_row(new_parent_key, 'StudyInstanceUID')
 
         if len(all_studies) == 1:
             return all_studies[0]

dbdicom/pipelines.py

@@ -0,0 +1,66 @@
+"""
+Some utilities for writing automated pipelines.
+"""
+
+
+
+def input_series(database, series_desc, study_desc=None, handle_duplicate=False):
+    """Select a list of series for processing, and a study for saving the results"""
+
+    # Make sure the input is a list for convenience
+    lst = True
+    if not isinstance(series_desc, list):
+        lst = False
+        series_desc = [series_desc]
+
+    # Find series and check if valid
+    input_series = []
+    for desc in series_desc:
+        database.message('Finding input series ' + desc)
+        series = database.series(SeriesDescription=desc)
+        if series == []:
+            return None, None
+        elif len(series) > 1:
+            msg = 'Multiple series found with the description: ' + desc + '\n'
+            #msg += 'Please rename the others so there is only one.'
+            msg += 'Last one was selected'
+            database.dialog.information(msg)
+            if handle_duplicate:
+                series = series[-1]
+            else:
+                return None,None
+        else:
+            series = series[0]
+        input_series.append(series)
+
+    if study_desc is None:
+        # If the input was a list, return a list - else return a scalar.
+        if lst:
+            return input_series
+        else:
+            return input_series[0]
+        
+    # Find study and check if valid.
+    database.message('Finding export study ' + study_desc)
+    studies = database.studies(StudyDescription=study_desc)
+    if studies == []:
+        study = input_series[0].new_pibling(StudyDescription=study_desc)
+    elif len(studies) > 1:
+        msg = 'Multiple studies found with the same description: ' + study_desc + '\n'
+        #msg += 'Please rename the others so there is only one, or choose another study for the output.'
+        msg += 'Last one was selected'
+        database.dialog.information(msg)
+        #return None, None
+        if handle_duplicate:
+            study = studies[-1]
+        else:
+            return None,None
+        
+    else:
+        study = studies[0]
+
+    # If the input was a list, return a list - else return a scalar.
+    if lst:
+        return input_series, study
+    else:
+        return input_series[0], study