# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1451910537 -3600
# Node ID 8d16ed93ce09c30260ffd46c07bada1ee9d00601
# Parent  97acfdf0dbce6e674403a63724209322970f595e# Parent  34078a9b8f55fdd2c17bf6aaa1abe3983ed8835d
merge

diff -r 97acfdf0dbce -r 8d16ed93ce09 Database/Comunix/Ct/IM-0001-0001.dcm
Binary file Database/Comunix/Ct/IM-0001-0001.dcm has changed
diff -r 97acfdf0dbce -r 8d16ed93ce09 Database/Comunix/Pet/IM-0001-0001.dcm
Binary file Database/Comunix/Pet/IM-0001-0001.dcm has changed
diff -r 97acfdf0dbce -r 8d16ed93ce09 Database/Comunix/Pet/IM-0001-0002.dcm
Binary file Database/Comunix/Pet/IM-0001-0002.dcm has changed
diff -r 97acfdf0dbce -r 8d16ed93ce09 Database/README.txt
--- a/Database/README.txt	Mon Jan 04 13:27:26 2016 +0100
+++ b/Database/README.txt	Mon Jan 04 13:28:57 2016 +0100
@@ -43,6 +43,7 @@
 - Brainix/* : From OsiriX, "BRAINIX" (sample of uncompressed data).
 - ColorTestImageJ.dcm : From ImageJ, http://imagej.nih.gov/ij/images/cardio.dcm
 - ColorTestMalaterre.dcm : From Mathieu Malaterre <mathieu.malaterre@gmail.com>, Debian bug #698417
+- Comunix/* : From OsiriX, "COMUNIX" (sample of PET/CT study).
 - DummyCT.dcm : From Osirix, "KNIX" with PixelData removed.
 - Issue16.dcm : From Chris Hafey on Google Code (AT VR's are not returned properly as JSON)
 - Issue19.dcm : From Chris Hafey on Google Code (YBR_FULL are not decoded incorrectly)
diff -r 97acfdf0dbce -r 8d16ed93ce09 Tests/Tests.py
--- a/Tests/Tests.py	Mon Jan 04 13:27:26 2016 +0100
+++ b/Tests/Tests.py	Mon Jan 04 13:28:57 2016 +0100
@@ -77,6 +77,14 @@
     return True
 
 
+def CallFindScu(args):
+    p = subprocess.Popen([ FindExecutable('findscu'), 
+                           '-P', '-aec', _REMOTE['DicomAet'], '-aet', _LOCAL['DicomAet'],
+                           _REMOTE['Server'], str(_REMOTE['DicomPort']) ] + args,
+                         stderr=subprocess.PIPE)
+    return p.communicate()[1]
+
+
 def CallMoveScu(args):
     subprocess.check_call([ FindExecutable('movescu'), 
                             '--move', _LOCAL['DicomAet'],      # Target AET (i.e. storescp)
@@ -1033,13 +1041,6 @@
 
 
     def test_incoming_findscu(self):
-        def CallFindScu(args):
-            p = subprocess.Popen([ FindExecutable('findscu'), 
-                                   '-P', '-aec', _REMOTE['DicomAet'], '-aet', _LOCAL['DicomAet'],
-                                   _REMOTE['Server'], str(_REMOTE['DicomPort']) ] + args,
-                                 stderr=subprocess.PIPE)
-            return p.communicate()[1]
-
         UploadInstance(_REMOTE, 'Multiframe.dcm')
         UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')
 
@@ -2685,3 +2686,56 @@
         self.assertTrue(re.search('1.2.826.0.1.3680043.2.1569.1.4.323026757.1700.1399452091.57', a) != None)
 
         os.remove('/tmp/DICOMDIR')
+
+
+    def test_findscu_counters(self):
+        UploadInstance(_REMOTE, 'Comunix/Ct/IM-0001-0001.dcm')
+        UploadInstance(_REMOTE, 'Comunix/Pet/IM-0001-0001.dcm')
+        UploadInstance(_REMOTE, 'Comunix/Pet/IM-0001-0002.dcm')
+
+        i = CallFindScu([ '-k', '0008,0052=PATIENT', '-k', 'NumberOfPatientRelatedStudies' ])
+        s = re.findall('\(0020,1200\).*?\[(.*?)\]', i)
+        self.assertEqual(1, len(s))
+        self.assertTrue('1 ' in s)
+
+        i = CallFindScu([ '-k', '0008,0052=PATIENT', '-k', 'NumberOfPatientRelatedSeries' ])
+        s = re.findall('\(0020,1202\).*?\[(.*?)\]', i)
+        self.assertEqual(1, len(s))
+        self.assertTrue('2 ' in s)
+
+        i = CallFindScu([ '-k', '0008,0052=PATIENT', '-k', 'NumberOfPatientRelatedInstances' ])
+        s = re.findall('\(0020,1204\).*?\[(.*?)\]', i)
+        self.assertEqual(1, len(s))
+        self.assertTrue('3 ' in s)
+
+        i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', 'NumberOfStudyRelatedSeries' ])
+        s = re.findall('\(0020,1206\).*?\[(.*?)\]', i)
+        self.assertEqual(1, len(s))
+        self.assertTrue('2 ' in s)
+
+        i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', 'NumberOfStudyRelatedInstances' ])
+        s = re.findall('\(0020,1208\).*?\[(.*?)\]', i)
+        self.assertEqual(1, len(s))
+        self.assertTrue('3 ' in s)
+
+        i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', 'NumberOfSeriesRelatedInstances' ])
+        s = re.findall('\(0020,1209\).*?\[(.*?)\]', i)
+        self.assertEqual(2, len(s))
+        self.assertTrue('1 ' in s)
+        self.assertTrue('2 ' in s)
+
+        i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', 'ModalitiesInStudy' ])
+        s = re.findall('\(0008,0061\).*?\[(.*?)\]', i)
+        self.assertEqual(1, len(s))
+        t = map(lambda x: x.strip(), s[0].split('\\'))
+        self.assertTrue('PT' in t)
+        self.assertTrue('CT' in t)
+
+        i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', 'SOPClassesInStudy' ])
+        s = re.findall('\(0008,0062\).*?\[(.*?)\]', i)
+        self.assertEqual(1, len(s))
+        t = map(lambda x: x.strip(), s[0].split('\\'))
+        self.assertTrue('1.2.840.10008.5.1.4.1.1.2' in t)
+        self.assertTrue('1.2.840.10008.5.1.4.1.1.128' in t)
+
+