More Python3 support + read images without .dcm extension

Author: janpipek

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2015 Jan Pipek
+Copyright (c) 2014-2016 Jan Pipek
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

pydiq/dicom_data.py

@@ -55,7 +55,7 @@ def array(self):
     def get_slice(self, plane, n):
         if plane not in ALLOWED_PLANES:
             raise ValueError("Invalid plane identificator (allowed are 0,1,2)")
-        index = [slice(None, None, None) for i in xrange(3)]
+        index = [slice(None, None, None) for i in range(3)]
         index[plane] = n
         return self._array[index]
 

pydiq/utils.py

@@ -1,9 +1,25 @@
 import dicom
 from collections import OrderedDict
+import os
 
 
 def get_id(path):
     f = dicom.read_file(path, stop_before_pixels=True)
     return f.StudyInstanceUID, f.SeriesInstanceUID
 
-# def
+
+def is_dicom_file(path):
+    """Fast way to check whether file is DICOM."""
+    if not os.path.isfile(path):
+        return False
+    try:
+        with open(path, "rb") as f:
+            return f.read(132).decode("ASCII")[-4:] == "DICM"
+    except:
+        return False
+
+def dicom_files_in_dir(directory="."):
+    """Full paths of all DICOM files in the directory."""
+    directory = os.path.expanduser(directory)
+    candidates = [os.path.join(directory, f) for f in sorted(os.listdir(directory))]
+    return [f for f in candidates if is_dicom_file(f)]

pydiq/viewer.py

@@ -9,6 +9,7 @@
 
 from .dicom_data import DicomData
 from .dicom_widget import DicomWidget
+from .utils import dicom_files_in_dir
 
 
 class TrackingLabel(QtGui.QLabel):
@@ -115,9 +116,9 @@ def __init__(self, path = None):
         self.update_cw()
 
         if os.path.isfile(path):
-            self.load_files(path)
+            self.load_files([path])
         elif os.path.isdir(path):
-            self.load_files(os.path.join(path, "*.dcm"))
+            self.load_files(dicom_files_in_dir(path))
         self.build_menu()
 
     def open_directory(self):
@@ -126,7 +127,8 @@ def open_directory(self):
         dialog.setViewMode(QtGui.QFileDialog.List)
         dialog.setOption(QtGui.QFileDialog.ShowDirsOnly, True)
         if dialog.exec_():
-            self.load_files(os.path.join(str(dialog.selectedFiles()[0]), "*.dcm"))
+            directory = str(dialog.selectedFiles()[0])
+            self.load_files(dicom_files_in_dir(directory))
 
     def export_image(self):
         file_name = QtGui.QFileDialog.getSaveFileName(
@@ -180,12 +182,9 @@ def on_file_item_change(self):
             # print item.text()
             self.file_name = str(item.toolTip())
 
-    def load_files(self, glob_string):
+    def load_files(self, files):
         self.file_list.clear()
-        if glob_string:
-            self.files = sorted(glob.glob(glob_string))
-        else:
-            self.files = ()
+        self.files = files
         for file_name in self.files:
             item = QtGui.QListWidgetItem(os.path.basename(file_name))
             item.setToolTip(file_name)

requirements.txt

@@ -0,0 +1,2 @@
+numpy
+pydicom