From: frog Date: Tue, 3 Aug 2004 17:28:57 +0000 (+0000) Subject: * gdcmPython/testSuite.py: all the test suite in python is now moved X-Git-Tag: Version0.5.bp~17 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=1778ad2b599c79e3012b4c055d0613509039213c;p=gdcm.git * gdcmPython/testSuite.py: all the test suite in python is now moved to it's C++ version (see gdcmData/TestAllEntryVerifyReference.txt) * Test/CMakeLists.txt adapted to renaming of files in gdcmData * gdcm/TODO and src/gdcmDictSet.h cleaned up frow the "TODO Swig" oldies --- diff --git a/ChangeLog b/ChangeLog index 94f4c4ec..639019aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-08-03 Eric Boix + * gdcmPython/testSuite.py: all the test suite in python is now moved + to it's C++ version (see gdcmData/TestAllEntryVerifyReference.txt) + * Test/CMakeLists.txt adapted to renaming of files in gdcmData + * gdcm/TODO and src/gdcmDictSet.h cleaned up frow the "TODO Swig" oldies + 2004-08-02 Eric Boix * gdcmPython/CMakeLists.txt: SWIG_FLAGS doesn't declare includeall to avoid inclusion recursion until STL is reached. diff --git a/TODO b/TODO index 86c7f7cb..a891bf9f 100644 --- a/TODO +++ b/TODO @@ -29,11 +29,6 @@ Convert the C-like IO to C++ IO: gdcmElValSet::GetElValueByNumber except for the returned code. gdcmHeader::SetPubElValLengthByNumber (which is based on gdcmElValSet::SetElValueLengthByNumber) is used nowhere... -* The declarations commented out and starting with "TODO Swig" (try - grep "TODO Swig" *.h) needed to be temporarily removed for swig to - proceed correctly (in fact problems appears at loading of _gdcm.[so/dll]). - So, simply uncomment the declaration once you provided the definition of - the method... * Fix the bug in Test/bug1.cxx (see first comment line): Win32 only. * All (or at least many of) the methods of gdcmHeader whose only arguments are an ElValue* (e.g. FindLength, FindVR, LoadElementValue...) can diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt index 4af332fd..89a40dc1 100644 --- a/Testing/CMakeLists.txt +++ b/Testing/CMakeLists.txt @@ -102,14 +102,14 @@ ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9) # Black list of images known to break lots of readers (efilm, xmedcon ...): SET(BLACK_LIST - # serial killer + # serial killer (also segfaults vtkgdcmViewer, but NOT PrintFile) "gdcm-JPEG-LossLessThoravision.dcm" #temporarily remove as it kills my gnome session (but not kde) - "cr172241.dcm" + "KODAK-12-MONO1-Odd_Terminated_Sequence.dcm" #png looks ugly "emptyImage.dcm" #png looks ugly - "irmPhlipsNew1.dcm" + "PHILIPS_Gyroscan-8-MONO2-Odd_Sequence.dcm" #png looks ugly "mriThruVPRO.dcm" #segfaults TestReadWriteReadCompare (same pb as below) @@ -118,8 +118,8 @@ SET(BLACK_LIST "SIEMENS_GBS_III-16-ACR_NEMA_1.acr" #segfaults TestReadWriteReadCompare (pixels not parsed properly): "I9000001.dcm" - "icone.dcm" - "sonataMonaco.dcm" + "PICKER-16-MONO2-Nested_icon.dcm" + "SIEMENS_Sonata-16-MONO2-Value_Multiplicity.dcm" # Fails on TestAllReadCompareDicom at the RE-reading stage with message: # Big trouble : Pixel Element (7fe0,10) NOT found # The temporary file GDCMDATAHOME/BaselineDicom/SIEMENS_Sonata-12-MONO2-SQ.dcm diff --git a/gdcmPython/testSuite.py b/gdcmPython/testSuite.py index 8dcc6007..d10c35bb 100644 --- a/gdcmPython/testSuite.py +++ b/gdcmPython/testSuite.py @@ -10,334 +10,11 @@ class gdcmTestCase(unittest.TestCase): # The files whose name starts with a modality (e.g. CR-MONO1-10-chest.dcm) # come from Sebastien Barre's Dicom2 highly recommendable site # http://www.barre.nom.fr/medical/samples/index.html - BarreFiles = [ - #################################### - # CT modality examples: - #################################### - ["CT-MONO2-16-ort.dcm", - [ ["Transfer Syntax UID", "1.2.840.10008.1.2"], # Implicit VR, LE - ["Modality", "CT"], - ["Rows", "512"], - ["Columns", "512"], - ["Bits Stored", "16"], - ["Bits Allocated", "16"], - ["High Bit", "15"], - ["Pixel Representation", "1"], - ["Manufacturer", "GE MEDICAL SYSTEMS"], - ["Manufacturer's Model Name", "HiSpeed CT/i"], - ["Pixel Data", "gdcm::NotLoaded. Address:1674 Length:524288 x(80000)"] - ] ], - ["CT-MONO2-16-ankle.dcm", - [ ["Transfer Syntax UID", "1.2.840.10008.1.2"], # Implicit, little - ["Modality", "CT"], - ["Rows", "512"], - ["Columns", "512"], - ["Bits Stored", "16"], - ["Bits Allocated", "16"], - ["High Bit", "15"], - ["Pixel Representation", "1"], - ["Manufacturer", "GE MEDICAL SYSTEMS"], - ["Manufacturer's Model Name", "GENESIS_ZEUS"], - ["Pixel Data", "gdcm::NotLoaded. Address:1148 Length:524288 x(80000)"] - ] ], - ["CT-MONO2-8-abdo.dcm", - [ ["Transfer Syntax UID", "1.2.840.10008.1.2"], # Implicit, little - ["Modality", "CT"], - ["Rows", "512"], - ["Columns", "512"], - ["Bits Stored", "8"], - ["Bits Allocated", "8"], - ["High Bit", "7"], - ["Pixel Representation", "0"], - ["Manufacturer", "FUJI"], - ["Pixel Data", "gdcm::NotLoaded. Address:796 Length:262144 x(40000)"] - ] ], - ["CT-MONO2-12-lomb-an2.acr", - [ ["Modality", "CT"], - #"Transfer Syntax UID" and "Photometric Interpretation" are absent. - ["Rows", "512"], - ["Columns", "512"], - ["Bits Stored", "12"], - ["Bits Allocated", "16"], - ["High Bit", "11"], - ["Pixel Representation", "0"], - ["Manufacturer", "SIEMENS"], - ["Pixel Data", "gdcm::NotLoaded. Address:1230 Length:524288 x(80000)"] - ] ], - ["CT-MONO2-16-chest.dcm", - [ ["Transfer Syntax UID", "1.2.840.10008.1.2.4.70"], # jpeg... - ["Modality", "CT"], - ["Photometric Interpretation", "MONOCHROME2"], - ["Rows", "400"], - ["Columns", "512"], - ["Bits Stored", "16"], - ["Bits Allocated", "16"], - ["High Bit", "15"], - ["Pixel Representation", "1"], - ["Manufacturer", "GE MEDICAL SYSTEMS"], - ["Pixel Data", "gdcm::NotLoaded. Address:1638 Length:143498 x(2308a)"] - ] ], - #################################### - ### MR modality examples: - #################################### - ["MR-MONO2-12-angio-an1.acr", - [ ["Recognition Code (RET)", "ACR-NEMA 1.0"], - ["Modality", "MR"], - #"Transfer Syntax UID" and "Photometric Interpretation" are absent. - ["Rows", "256"], - ["Columns", "256"], - ["Bits Stored", "12"], - ["Bits Allocated", "12"], - ["High Bit", "11"], - ["Pixel Representation", "0"], - ["Manufacturer", "Philips"], - # Note: 256*256*12/8 = 98304 - ["Pixel Data", "gdcm::NotLoaded. Address:650 Length:98304 x(18000)"] - ] ], - ["MR-MONO2-12-an2.acr", - [ ["Modality", "MR"], - ["Photometric Interpretation", "MONOCHROME2"], - ["Rows", "256"], - ["Columns", "256"], - ["Bits Stored", "12"], - ["Bits Allocated", "16"], - ["High Bit", "11"], - ["Pixel Representation", "0"], - ["Manufacturer", "SIEMENS"], - ["Manufacturer's Model Name", "MAGNETOM VISION"], - ["Pixel Data", "gdcm::NotLoaded. Address:1866 Length:131072 x(20000)"] - ] ], - ["MR-MONO2-16-head.dcm", - [ ["Transfer Syntax UID", "1.2.840.10008.1.2"], # Imp VR, LE - ["Modality", "MR"], - ["Photometric Interpretation", "MONOCHROME2"], - ["Rows", "256"], - ["Columns", "256"], - ["Bits Stored", "16"], - ["Bits Allocated", "16"], - ["High Bit", "15"], - ["Pixel Representation", "1"], - ["Manufacturer", "GE MEDICAL SYSTEMS"], - ["Manufacturer's Model Name", "GENESIS_SIGNA"], - ["Pixel Data", "gdcm::NotLoaded. Address:1804 Length:131072 x(20000)"] - ] ], - # MR-MONO2-12-shoulder example is present in the Jpeg section. - # MR-MONO2-16-knee is not present in the test suite since it is too - # closely related to MR-MONO2-16-head.dcm to be of interest. - #################################### - # OT modality examples: - #################################### - # OT-MONO2-8-hip is not present in the test suite since it is too - # closely related to OT-MONO2-8-a7 to be of interest. - ["OT-PAL-8-face.dcm", - # Interest: has a color palette - [#"Transfer Syntax UID", and "Manufacturer" are absent. - ["Modality", "OT"], - ["Photometric Interpretation", "PALETTE COLOR"], - ["Rows", "480"], - ["Columns", "640"], - ["Bits Stored", "8"], - ["Bits Allocated", "8"], - ["High Bit", "7"], - ["Pixel Representation", "0"], - ["Pixel Data", "gdcm::NotLoaded. Address:1654 Length:307200 x(4b000)"] - ] ], - # OT-MONO2-8-colon is not present in the test suite since it is too - # closely related to OT-MONO2-8-a7 to be of interest. - ["OT-MONO2-8-a7.dcm", - [#"Transfer Syntax UID" is absent. - ["Modality", "OT"], - ["Photometric Interpretation", "MONOCHROME2"], - ["Rows", "512"], - ["Columns", "512"], - ["Bits Stored", "8"], - ["Bits Allocated", "8"], - ["High Bit", "7"], - ["Pixel Representation", "0"], - ["Manufacturer", "Philips Medical Systems"], - ["Pixel Data", "gdcm::NotLoaded. Address:438 Length:262144 x(40000)"] - ] ], - #################################### - # US (Ultra Sound) modality examples: - #################################### - ["US-RGB-8-esopecho.dcm", - # Interest: RGB image - [ ["Transfer Syntax UID", "1.2.840.10008.1.2.1"], # Exp VR, LE - ["Modality", "US"], - ["Photometric Interpretation", "RGB"], - ["Rows", "120"], - ["Columns", "256"], - ["Bits Stored", "8"], - ["Bits Allocated", "8"], - ["High Bit", "7"], - ["Pixel Representation", "0"], - ["Manufacturer", "Acme Products"], - # FIXME: 92160 / (120*256) = 3 bytes per pixel NOT 1. Maybe - # it has something to do with [Samples Per Pixel] = [3] ??? - # You said it, puffy (tu l'as dit, bouffi, in french language) - # RGB is 3 bytes per pixel - # + Planar configuration (0028,0006) = 0 --> Pixels RGB - ["Pixel Data", "gdcm::NotLoaded. Address:904 Length:92160 x(16800)"] - ] ], - ["US-RGB-8-epicard.dcm", - # Interest: Big endian transfert syntax - [ ["Transfer Syntax UID", "1.2.840.10008.1.2.2"], # Big endian - # But ... group 0000 is LE . - ["Modality", "US"], - ["Photometric Interpretation", "RGB"], - ["Rows", "480"], - ["Columns", "640"], - ["Bits Stored", "8"], - ["Bits Allocated", "8"], - ["High Bit", "7"], - ["Pixel Representation", "0"], - ["Manufacturer", "G.E. Medical Systems"], - ["Manufacturer's Model Name", "LOGIQ 700"], - # + Planar configuration (0028,0006) = 1 --> Plane R, Plane G, Plane B - ["Implementation Version Name", "OFFIS-DCMTK-311"], - ["Pixel Data", "gdcm::NotLoaded. Address:1012 Length:921600 x(e1000)"] - ] ], - ] MultiFrameFiles = [ - # The number of images is contained in the "Number of Frames" element - ["MR-MONO2-8-16x-heart.dcm", - # Interest: multi-frame - [ ["Transfer Syntax UID", "1.2.840.10008.1.2.1"], # ExpVR, LE - ["Number of Frames", "16"], - ["Modality", "MR"], - ["Photometric Interpretation", "MONOCHROME2"], - ["Rows", "256"], - ["Columns", "256"], - ["Bits Stored", "8"], - ["Bits Allocated", "8"], - ["High Bit", "7"], - ["Pixel Representation", "0"], - ["Manufacturer", "Philips"], - # Note: 256*256*16=1048576 (16 is the number of Frames) - ["Pixel Data", "gdcm::NotLoaded. Address:920 Length:1048576 x(100000)"] - ] ], - ["NM-MONO2-16-13x-heart.dcm", - # Interest: NM modality, multi-frame - [ ["Transfer Syntax UID", "1.2.840.10008.1.2.1"], # ExpVR, LE - ["Number of Frames", "13"], - ["Modality", "NM"], - ["Photometric Interpretation", "MONOCHROME2"], - ["Rows", "64"], - ["Columns", "64"], - ["Bits Stored", "16"], - ["Bits Allocated", "16"], - ["High Bit", "15"], - ["Pixel Representation", "0"], - ["Manufacturer", "ACME Products"], - # Note: 64*64*13*2=106496 - ["Pixel Data", "gdcm::NotLoaded. Address:1234 Length:106496 x(1a000)"] - ] ], - ["US-MONO2-8-8x-execho.dcm", - # Interest: multi-frame - [ ["Transfer Syntax UID", "1.2.840.10008.1.2.1"], # ExpVR, LE - ["Number of Frames", "8"], - ["Modality", "US"], - ["Photometric Interpretation", "MONOCHROME2"], - ["Rows", "120"], - ["Columns", "128"], - ["Bits Stored", "8"], - ["Bits Allocated", "8"], - ["High Bit", "7"], - ["Pixel Representation", "0"], - ["Manufacturer", "Acme Products"], - ["Pixel Data", "gdcm::NotLoaded. Address:976 Length:122880 x(1e000)"] - ] ], - ["US-PAL-8-10x-echo.dcm", - # Interest: RLE (Run Length Encoded) compression, multiframe - [ ["Transfer Syntax UID", "1.2.840.10008.1.2.5"], # RLE - ["Number of Frames", "10"], - ["Modality", "US"], - ["Photometric Interpretation", "PALETTE COLOR"], - ["Rows", "430"], - ["Columns", "600"], - ["Bits Stored", "8"], - ["Bits Allocated", "8"], - ["High Bit", "7"], - ["Pixel Representation", "0"], - ["Manufacturer", "ACME Products"], - ["Pixel Data", "gdcm::NotLoaded. Address:2428 Length:481182 x(7579e)"] - ] ], - ["XA-MONO2-8-12x-catheter.dcm", - # Interest: XA modality, multi-frame - [ #["Transfer Syntax UID", "1.2.840.10008.1.2.4.70"], # jpeg - ["Number of Frames", "12"], # 12 images - ["Modality", "XA"], - ["Photometric Interpretation", "MONOCHROME2"], - ["Rows", "512"], - ["Columns", "512"], - ["Bits Stored", "8"], - ["Bits Allocated", "8"], - ["High Bit", "7"], - ["Pixel Representation", "0"], - ["Manufacturer", "Acme Products"], - ["Pixel Data", "gdcm::NotLoaded. Address:1006 Length:920072 x(e0a08)"] - ] ], - ] GdcmFiles = [ - ["gdcm-MR-SIEMENS-16-1.acr", - # Interest: good old Acr-Nema Version 1, see also Oddities below - [ ["Recognition Code (RET)", "ACR-NEMA 1.0"], - ["Modality", "MR"], - ["Rows", "256"], - ["Columns", "256"], - ["Bits Stored", "12"], - ["Bits Allocated", "16"], - ["High Bit", "11"], - ["Pixel Representation", "0"], - ["Manufacturer", "SIEMENS"], - ["Manufacturer's Model Name", "GBS III"], - # FIXME: this image looks padded at the end. The length of the file - # is 140288. Notice that, 256*256*2 + 1024 = 131072 + 1024 = 132096 - ["Pixel Data", "gdcm::NotLoaded. Address:8192 Length:132096 x(20400)"], - # Oddities: "Study ID" and "Series Number" are empty - ["Study ID", ""], - ["Series Number", ""] ] ], - # Oddities: "Study" and "Serie Instance UID" are not present - ["gdcm-MR-SIEMENS-16-2.acr", - # Interest: Acr-Nema Version 2 - [ ["Recognition Code (RET)", "ACR-NEMA 2.0"], - ["Modality", "MR"], - ["Rows", "512"], - ["Columns", "512"], - ["Bits Stored", "12"], - ["Bits Allocated", "16"], - ["High Bit", "11"], - ["Pixel Representation", "0"], - ["Manufacturer", "SIEMENS"], - ["Manufacturer's Model Name", "MAGNETOM VISION"], - ["Study Instance UID", - "1.3.12.2.1107.5.2.4.7630.20000918174641000"], - ["Study ID", "1"], - ["Series Instance UID", - "1.3.12.2.1107.5.2.4.7630.20000918175714000007"], - ["Series Number", "7"], - ["Pixel Data", "gdcm::NotLoaded. Address:6052 Length:524288 x(80000)"] - ] ], - ["gdcm-US-ALOKA-16.dcm", - # Interest: - possesses 3 LUTS: a Green (checked), a Red and BLue. - # - announced as implicit VR, but really explicit VR. - [ ["Transfer Syntax UID", "1.2.840.10008.1.2"], # Implicit VR, LE - ["Modality", "US"], - ["Photometric Interpretation", "PALETTE COLOR"], - ["Segmented Green Palette Color Lookup Table Data", - "gdcm::NotLoaded. Address:89576 Length:113784 x(1bc78)"], - ["Rows", "480"], - ["Columns", "640"], - ["Bits Stored", "16"], - ["Bits Allocated", "16"], - ["High Bit", "15"], - ["Pixel Representation", "0"], - ["Manufacturer", "ALOKA CO., LTD."], - ["Manufacturer's Model Name", "SSD-4000"], - ["Pixel Data", "gdcm::NotLoaded. Address:258740 Length:614400 x(96000)"] - ] ], + # FOLLOWING FILE NOT IN GDCMDATA ANYMORE !?!?!?! ["gdcm-MR-PHILIPS-16.dcm", # Interest: - possesses a sequence # - dicom file, with a recognition code of ACR-NEMA1 @@ -356,155 +33,6 @@ class gdcmTestCase(unittest.TestCase): ["Sequence Variant", "OTHER"], ["Pixel Data", "gdcm::NotLoaded. Address:6584 Length:131072 x(20000)"] ] ], - ["gdcm-MR-PHILIPS-16-Multi-Seq.dcm", - # Interest: - possesses many sequences in group 0x0029 - # - Big sequence 28808 bytes at (0x0029, 0x263d) - # - dicom file, with a recognition code of ACR-NEMA1 - [ ["Transfer Syntax UID", "1.2.840.10008.1.2.1"], - ["Recognition Code (RET)", "ACR-NEMA 1.0"], - ["Modality", "MR"], - ["Photometric Interpretation", "MONOCHROME2"], - ["Rows", "128"], - ["Columns", "128"], - ["Bits Stored", "12"], - ["Bits Allocated", "16"], - ["High Bit", "11"], - ["Pixel Representation", "0"], - ["Manufacturer", "Philips Medical Systems"], - ["Manufacturer's Model Name", "Gyroscan Intera"], - ["Sequence Variant", "OTHER"], - ["Pixel Data", "gdcm::NotLoaded. Address:35846 Length:32768 x(8000)"] - ] ], - ["gdcm-MR-PHILIPS-16-NonRectPix.dcm", - # Interest: - pixels are non rectangular - # - private elements are in explicit VR (which is normal) - [ ["Transfer Syntax UID", "1.2.840.10008.1.2.1"], # Explicit VR, LE - ["Modality", "MR"], - ["Photometric Interpretation", "MONOCHROME2"], - ["Rows", "64"], - ["Columns", "160"], - ["Bits Stored", "12"], - ["Bits Allocated", "16"], - ["High Bit", "11"], - ["Pixel Representation", "0"], - ["Manufacturer", "Philips Medical Systems"], - ["Manufacturer's Model Name", "Gyroscan Intera"], - ["Pixel Spacing", "0.487416\\0.194966"], - ["Pixel Data", "gdcm::NotLoaded. Address:5010 Length:20480 x(5000)"] - ] ], - ["gdcm-CR-DCMTK-16-NonSamplePerPix.dcm", - # Interest: - Misses the "Samples Per Pixel" element which prevents - # e-film from reading it. - # - Misses the Manufacturer related info - [ ["Transfer Syntax UID", "1.2.840.10008.1.2.1"], # Explicit VR, LE - ["Modality", "CR"], - ["Photometric Interpretation", "MONOCHROME2"], - ["Rows", "750"], - ["Columns", "750"], - ["Bits Stored", "8"], - ["Bits Allocated", "8"], - ["High Bit", "7"], - ["Pixel Representation", "0"], - ["Implementation Version Name", "OFFIS_DCMTK_341"], - ["Pixel Data", "gdcm::NotLoaded. Address:740 Length:562500 x(89544)"] - ] ], - ] - - GdcmJpegFiles = [ - ["gdcm-JPEG-Extended.dcm", - # Interest: Jpeg compression [Extended (2,4)] - [ ["Transfer Syntax UID", "1.2.840.10008.1.2.4.51"], - ["Modality", "CT"], - ["Photometric Interpretation", "MONOCHROME2"], - ["Rows", "512"], - ["Columns", "512"], - ["Bits Stored", "12"], - ["Bits Allocated", "16"], - ["High Bit", "11"], - ["Pixel Representation", "0"], - ["Manufacturer", "SIEMENS"], - ["Manufacturer's Model Name", "Volume Zoom"], - ["Pixel Data", "gdcm::NotLoaded. Address:2946 Length:192218 x(2eeda)"] - ] ], - ["MR-MONO2-12-shoulder.dcm", - # Interest: Jpeg compression [Lossless, non-hierar. (14)] - [ ["Transfer Syntax UID", "1.2.840.10008.1.2.4.57"], - ["Modality", "MR"], - ["Photometric Interpretation", "MONOCHROME2"], - ["Rows", "1024"], - ["Columns", "1024"], - ["Bits Stored", "12"], - ["Bits Allocated", "16"], - ["High Bit", "11"], - ["Pixel Representation", "0"], - ["Manufacturer", "Philips Medical Systems"], - ["Manufacturer's Model Name", "Gyroscan NT"], - ["Pixel Data", "gdcm::NotLoaded. Address:1580 Length:718948 x(af864)"] - ] ], - ["gdcm-JPEG-LossLess3a.dcm", - # Interest: - Jpeg compression [Lossless, hierar., first-order - # pred. 14, Select. Val. 1] - # - contains a sequence [circa (0008,2112)] - # - contains additional data after the pixels ??? - [ ["Transfer Syntax UID", "1.2.840.10008.1.2.4.70"], - ["Modality", "CT"], - ["Photometric Interpretation", "MONOCHROME2"], - ["Rows", "512"], - ["Columns", "512"], - ["Bits Stored", "12"], - ["Bits Allocated", "16"], - ["High Bit", "11"], - ["Pixel Representation", "0"], - ["Manufacturer", "SIEMENS"], - ["Manufacturer's Model Name", "Volume Zoom"] ] ], - # FIXME: the pixel data looks like corrupted. As stated by "od -A d -c" - # 0002528 à 177 020 \0 O B \0 \0 ÿ ÿ ÿ ÿ þ ÿ \0 à - # 0002544 \0 \0 \0 \0 þ ÿ \0 à 202 ? 003 \0 ÿ Ø ÿ Ã - # which we interpret as follows: - # - 2528: (à 177, 020 \0) = (0x7fe0, 0x0010) i.e. Pixel Data tag, - # - 2532: OB i.e. encapsulated encoded Pixel Data, - # - 2534: Two bytes reserved, - # - 2536: ÿ ÿ ÿ ÿ = 0xffffffff i.e. data element length is undefined. - # - 2540: (þ ÿ, \0 à) = (0xfffe, 0xe000) i.e. basic offset table - # item tag - # - 2544: \0 \0 \0 \0 i.e. offset table as length zero, i.e. no - # item value for offset table. - # - 2548: (þ ÿ, \0 à) = (0xfffe, 0xe000) i.e. item tag of first - # fragment of (encoded) pixel data. - # - 2552: 202 ? 003 \0 = 212866 bytes i.e. length of first fragment - # of (encoded) pixel data. - # and so the next item tag should be found at the 2556+212866 th - # octet i.e. at address 215422. But, as stated by od, we find: - # 0215408 E u Ö 026 Î É 7 ¬ Ã ¸ ó ¿ ÿ Ù \f ° - # 0215424 ¶ 016 P Ñ 002 016 - # and (\f °, ¶ 016) is NOT an OB item TAG which is required to be - # present (at least there should be a sequence delimiter), refer to - # PS 3.5-2001 page 50. - # - # That's right : - # at 9ec : ItemTag : fffe,e000 - # at 9f0 : Basic Offset Table Item Lentgh (??) 0 x(00000000) - # at 9f4 : ItemTag : fffe,e000 - # at 9f8 : fragment length 212866 x(00033f82) - # at 3497e : ItemTag b00c,0eb6 (should be fffe,e000 or fffe,e0dd): - - ["gdcm-JPEG-LossLessThoravision.dcm", - # Interest: - Jpeg compression [Lossless, hierar., first-order - # pred. 14, Select. Val. 1] - # - encoding is sligthly different from LossLess3a.dcm ??? - [ ["Transfer Syntax UID", "1.2.840.10008.1.2.4.70"], - ["Modality", "CR"], - ["Photometric Interpretation", "MONOCHROME2"], - ["Rows", "2076"], - ["Columns", "1876"], - ["Bits Stored", "15"], - ["Bits Allocated", "16"], - ["High Bit", "14"], - ["Pixel Representation", "0"], - ["Manufacturer", "Philips Medical Systems"], - ["Manufacturer's Model Name", "Cassette Holder Type 9840 500 35201"], - ["Pixel Data", "gdcm::NotLoaded. Address:3144 Length:4795668 x(492d14)"] - ] ], ] def _BaseTest(self, FileSet): @@ -522,34 +50,9 @@ class gdcmTestCase(unittest.TestCase): ("Wrong %s for file %s (got %s, shoud be %s)" % (element,fileName, valDict[element], value)) ) - def testBarre(self): - gdcmTestCase._BaseTest(self, gdcmTestCase.BarreFiles) - - def testMultiFram(self): - gdcmTestCase._BaseTest(self, gdcmTestCase.MultiFrameFiles) - def testFiles(self): gdcmTestCase._BaseTest(self, gdcmTestCase.GdcmFiles) - def testJpeg(self): - gdcmTestCase._BaseTest(self, gdcmTestCase.GdcmJpegFiles) - - def ZOBtestWrite(self): - import md5 - SourceFileName = os.path.join(GDCM_TEST_DATA_PATH, - 'gdcm-MR-PHILIPS-16-Multi-Seq.dcm') - Source = gdcmFile(SourceFileName); - Source.GetImageData() - TargetFileName = "junk" - Target = Source.WriteDcmImplVR(TargetFileName) -# Sign = 'a1e2abdc2f6abedd86b93c8b88db5203' # new signature (found on Win) - Sign = '849e722e004d3bb37b87ab6006509b8f' # new signature without field strip - ComputeSign = md5.new(open(TargetFileName).read()).hexdigest() - self.assertEqual(ComputeSign, Sign, - ("Wrong signature for file %s (got %s, shoud be %s)" - % (SourceFileName, ComputeSign, Sign)) ) - os.unlink(TargetFileName) - if __name__ == '__main__': if not GDCM_TEST_DATA_PATH: print "GDCM_TEST_DATA_PATH (internal variable) is not setup properly." diff --git a/src/gdcmDictSet.h b/src/gdcmDictSet.h index d6f5b4c9..1cd5b0d9 100644 --- a/src/gdcmDictSet.h +++ b/src/gdcmDictSet.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDictSet.h,v $ Language: C++ - Date: $Date: 2004/08/01 02:39:09 $ - Version: $Revision: 1.23 $ + Date: $Date: 2004/08/03 17:28:59 $ + Version: $Revision: 1.24 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -38,28 +38,22 @@ typedef std::map DictSetHT; class GDCM_EXPORT gdcmDictSet { public: - // TODO Swig int LoadDictFromFile(std::string filename); - // QUESTION: the following function might not be thread safe !? Maybe - // we need some mutex here, to avoid concurent creation of - // the same dictionary !?!?! - // TODO Swig int LoadDictFromName(std::string filename); - // TODO Swig int LoadAllDictFromDirectory(std::string DirectoryName); - // TODO Swig std::string* GetAllDictNames(); gdcmDictSet(); ~gdcmDictSet(); void Print(std::ostream& os); - std::list *GetPubDictEntryNames(); + std::list* GetPubDictEntryNames(); std::map > * GetPubDictEntryNamesByCategory(); - gdcmDict *LoadDictFromFile(std::string const & fileName, DictKey const & name); + gdcmDict* LoadDictFromFile( std::string const & fileName, + DictKey const & name ); - gdcmDict *GetDict(DictKey const & DictName); - gdcmDict *GetDefaultPubDict(); + gdcmDict* GetDict( DictKey const & DictName ); + gdcmDict* GetDefaultPubDict(); - gdcmDictEntry *NewVirtualDictEntry(uint16_t group, uint16_t element, + gdcmDictEntry* NewVirtualDictEntry(uint16_t group, uint16_t element, std::string vr = "Unknown", std::string fourth = "Unknown", std::string name = "Unknown");