From: jpr Date: Mon, 3 May 2004 09:32:07 +0000 (+0000) Subject: all the test are now invoked with gdcmCxxTest X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=aef17e6fb977351140180f532d328f144e2cefee;p=gdcmData.git all the test are now invoked with gdcmCxxTest --- diff --git a/checkPrintHeader.sh b/checkPrintHeader.sh index 585d2a2..5f80fe5 100755 --- a/checkPrintHeader.sh +++ b/checkPrintHeader.sh @@ -1,76 +1,76 @@ -PrintHeader 00191113.dcm -PrintHeader 012345.002.050.dcm -PrintHeader 16BitsJpegLosslessGrayScale.dcm -PrintHeader 16BitsRunLengthGrayScale.dcm -PrintHeader 16BitsUncompressedGrayScale.dcm -PrintHeader 24BitsJpegLosslessColor.dcm -PrintHeader 24BitsJpegLossyColor.dcm -PrintHeader 24BitsUncompressedColor.dcm -PrintHeader 8078283Leonardo.dcm -PrintHeader 8BitsJpegLossyGrayScale.dcm -PrintHeader 8BitsRunLengthColor.dcm -PrintHeader 8BitsRunLengthGrayScale.dcm -PrintHeader 8BitsUncompressedColor.dcm -PrintHeader 8BitsUncompressedGrayScale.dcm -PrintHeader canadaAloka.dcm -PrintHeader CLIP0001-Sequoia-U11.dcm -PrintHeader cr172241.dcm -PrintHeader cr_45031.dcm -PrintHeader CR-MONO1-10-chest.dcm -PrintHeader CT-MONO2-12-lomb-an2.acr2 -PrintHeader CT-MONO2-16-ankle.dcm -PrintHeader CT-MONO2-16-brain.dcm -PrintHeader CT-MONO2-16-chest.dcm -PrintHeader CT-MONO2-16-ort.dcm -PrintHeader CT-MONO2-8-abdo.dcm -PrintHeader DermaColorLossLess.dcm -PrintHeader DicomSampleNastyGEImage.dcm -PrintHeader FMAG0001.dcm -PrintHeader fromTheralys.dcm -PrintHeader gdcm-ACR-LibIDO.acr -PrintHeader gdcm-CR-DCMTK-16-NonSamplePerPix.dcm -PrintHeader gdcm-JPEG-Extended.dcm -PrintHeader gdcm-JPEG-LossLess3a.dcm -PrintHeader gdcm-JPEG-LossLessThoravision.dcm -PrintHeader gdcm-MR-PHILIPS-16.dcm -PrintHeader gdcm-MR-PHILIPS-16-Multi-Seq.dcm -PrintHeader gdcm-MR-PHILIPS-16-NonRectPix.dcm -PrintHeader gdcm-MR-SIEMENS-16.acr1 -PrintHeader gdcm-MR-SIEMENS-16.acr2 -PrintHeader gdcm-RGB-LibIDORect.acr -PrintHeader gdcm-US-ALOKA-16.dcm -PrintHeader I9000001.dcm -PrintHeader icone.dcm -PrintHeader irmPhlipsNew1.dcm -PrintHeader jpeg16Bits.dcm -PrintHeader jpeglossles1.dcm -PrintHeader jpeglossy1.dcm -PrintHeader jpeglossy2.dcm -PrintHeader mr176621.dcm -PrintHeader MR.6799.1.dcm -PrintHeader mriThruVPRO.dcm -PrintHeader MR-MONO2-12-an2.acr2 -PrintHeader MR-MONO2-12-angio-an1.acr1 -PrintHeader MR-MONO2-12-shoulder.dcm -PrintHeader MR-MONO2-16-head.dcm -PrintHeader MR-MONO2-8-16x-heart.dcm -PrintHeader multiframe1Integris.dcm -PrintHeader multiframe2GE.dcm -PrintHeader MxTwinLossLess.dcm -PrintHeader newACR1000.nema -PrintHeader NM-MONO2-16-13x-heart.dcm -PrintHeader oldACR00001.ima -PrintHeader OT-MONO2-8-a7.dcm -PrintHeader OT-PAL-8-face.dcm -PrintHeader QMAG0001.dcm -PrintHeader RadBWLossLess.dcm -PrintHeader sonataMonaco.dcm -PrintHeader test.acr -PrintHeader US.1.2.dcm -PrintHeader US.3405.1.dcm -PrintHeader US-MONO2-8-8x-execho.dcm -PrintHeader US-PAL-8-10x-echo.dcm -PrintHeader US-RGB-8-epicard.dcm -PrintHeader US-RGB-8-esopecho.dcm -PrintHeader xa_integris.dcm -PrintHeader XA-MONO2-8-12x-catheter.dcm +gdcmTests PrintHeader 00191113.dcm +gdcmTests PrintHeader 012345.002.050.dcm +gdcmTests PrintHeader 16BitsJpegLosslessGrayScale.dcm +gdcmTests PrintHeader 16BitsRunLengthGrayScale.dcm +gdcmTests PrintHeader 16BitsUncompressedGrayScale.dcm +gdcmTests PrintHeader 24BitsJpegLosslessColor.dcm +gdcmTests PrintHeader 24BitsJpegLossyColor.dcm +gdcmTests PrintHeader 24BitsUncompressedColor.dcm +gdcmTests PrintHeader 8078283Leonardo.dcm +gdcmTests PrintHeader 8BitsJpegLossyGrayScale.dcm +gdcmTests PrintHeader 8BitsRunLengthColor.dcm +gdcmTests PrintHeader 8BitsRunLengthGrayScale.dcm +gdcmTests PrintHeader 8BitsUncompressedColor.dcm +gdcmTests PrintHeader 8BitsUncompressedGrayScale.dcm +gdcmTests PrintHeader canadaAloka.dcm +gdcmTests PrintHeader CLIP0001-Sequoia-U11.dcm +gdcmTests PrintHeader cr172241.dcm +gdcmTests PrintHeader cr_45031.dcm +gdcmTests PrintHeader CR-MONO1-10-chest.dcm +gdcmTests PrintHeader CT-MONO2-12-lomb-an2.acr2 +gdcmTests PrintHeader CT-MONO2-16-ankle.dcm +gdcmTests PrintHeader CT-MONO2-16-brain.dcm +gdcmTests PrintHeader CT-MONO2-16-chest.dcm +gdcmTests PrintHeader CT-MONO2-16-ort.dcm +gdcmTests PrintHeader CT-MONO2-8-abdo.dcm +gdcmTests PrintHeader DermaColorLossLess.dcm +gdcmTests PrintHeader DicomSampleNastyGEImage.dcm +gdcmTests PrintHeader FMAG0001.dcm +gdcmTests PrintHeader fromTheralys.dcm +gdcmTests PrintHeader gdcm-ACR-LibIDO.acr +gdcmTests PrintHeader gdcm-CR-DCMTK-16-NonSamplePerPix.dcm +gdcmTests PrintHeader gdcm-JPEG-Extended.dcm +gdcmTests PrintHeader gdcm-JPEG-LossLess3a.dcm +gdcmTests PrintHeader gdcm-JPEG-LossLessThoravision.dcm +gdcmTests PrintHeader gdcm-MR-PHILIPS-16.dcm +gdcmTests PrintHeader gdcm-MR-PHILIPS-16-Multi-Seq.dcm +gdcmTests PrintHeader gdcm-MR-PHILIPS-16-NonRectPix.dcm +gdcmTests PrintHeader gdcm-MR-SIEMENS-16.acr1 +gdcmTests PrintHeader gdcm-MR-SIEMENS-16.acr2 +gdcmTests PrintHeader gdcm-RGB-LibIDORect.acr +gdcmTests PrintHeader gdcm-US-ALOKA-16.dcm +gdcmTests PrintHeader I9000001.dcm +gdcmTests PrintHeader icone.dcm +gdcmTests PrintHeader irmPhlipsNew1.dcm +gdcmTests PrintHeader jpeg16Bits.dcm +gdcmTests PrintHeader jpeglossles1.dcm +gdcmTests PrintHeader jpeglossy1.dcm +gdcmTests PrintHeader jpeglossy2.dcm +gdcmTests PrintHeader mr176621.dcm +gdcmTests PrintHeader MR.6799.1.dcm +gdcmTests PrintHeader mriThruVPRO.dcm +gdcmTests PrintHeader MR-MONO2-12-an2.acr2 +gdcmTests PrintHeader MR-MONO2-12-angio-an1.acr1 +gdcmTests PrintHeader MR-MONO2-12-shoulder.dcm +gdcmTests PrintHeader MR-MONO2-16-head.dcm +gdcmTests PrintHeader MR-MONO2-8-16x-heart.dcm +gdcmTests PrintHeader multiframe1Integris.dcm +gdcmTests PrintHeader multiframe2GE.dcm +gdcmTests PrintHeader MxTwinLossLess.dcm +gdcmTests PrintHeader newACR1000.nema +gdcmTests PrintHeader NM-MONO2-16-13x-heart.dcm +gdcmTests PrintHeader oldACR00001.ima +gdcmTests PrintHeader OT-MONO2-8-a7.dcm +gdcmTests PrintHeader OT-PAL-8-face.dcm +gdcmTests PrintHeader QMAG0001.dcm +gdcmTests PrintHeader RadBWLossLess.dcm +gdcmTests PrintHeader sonataMonaco.dcm +gdcmTests PrintHeader test.acr +gdcmTests PrintHeader US.1.2.dcm +gdcmTests PrintHeader US.3405.1.dcm +gdcmTests PrintHeader US-MONO2-8-8x-execho.dcm +gdcmTests PrintHeader US-PAL-8-10x-echo.dcm +gdcmTests PrintHeader US-RGB-8-epicard.dcm +gdcmTests PrintHeader US-RGB-8-esopecho.dcm +gdcmTests PrintHeader xa_integris.dcm +gdcmTests PrintHeader XA-MONO2-8-12x-catheter.dcm diff --git a/checkRead.sh b/checkRead.sh index 895ab26..e814806 100644 --- a/checkRead.sh +++ b/checkRead.sh @@ -12,107 +12,107 @@ # #No Swap Info #------------ -gdcmTests testWrite mr176621.dcm r; +gdcmCxxTests testWrite mr176621.dcm r; affim filein=mr176621.dcm.RAW DIMX=512 DIMY=512 nbit=16 # No Transfert Syntax #-------------------- #Big Endian -gdcmTests testWrite cr172241.dcm r; +gdcmCxxTests testWrite cr172241.dcm r; affim filein=cr172241.dcm.RAW DIMX=1792 DIMY=2392 nbit=16 zoom=-4 #0008,0200 (image location) wrongly stored #0028,3006 (LUT Data) has a CTX VR -gdcmTests testWrite cr_45031.dcm r; +gdcmCxxTests testWrite cr_45031.dcm r; affim filein=cr_45031.dcm.RAW DIMX=1670 DIMY=2010 nbit=16 zoom=-4 -gdcmTests testWrite CR-MONO1-10-chest.dcm r; +gdcmCxxTests testWrite CR-MONO1-10-chest.dcm r; affim filein=CR-MONO1-10-chest.dcm.RAW DIMX=440 DIMY=440 nbit=16 -gdcmTests testWrite CT-MONO2-12-lomb-an2.acr2 r; +gdcmCxxTests testWrite CT-MONO2-12-lomb-an2.acr2 r; affim filein=CT-MONO2-12-lomb-an2.acr2.RAW DIM=512 nbit=16 -gdcmTests testWrite gdcm-MR-SIEMENS-16.acr1 r; +gdcmCxxTests testWrite gdcm-MR-SIEMENS-16.acr1 r; affim filein=gdcm-MR-SIEMENS-16.acr1.RAW DIMX=256 DIMY=256 nbit=16 -gdcmTests testWrite gdcm-MR-SIEMENS-16.acr2 r; +gdcmCxxTests testWrite gdcm-MR-SIEMENS-16.acr2 r; affim filein=gdcm-MR-SIEMENS-16.acr2.RAW DIMX=512 DIMY=512 nbit=16 -gdcmTests testWrite MR-MONO2-12-an2.acr2 r; +gdcmCxxTests testWrite MR-MONO2-12-an2.acr2 r; affim filein=MR-MONO2-12-an2.acr2.RAW DIMX=256 DIMY=256 nbit=16 -gdcmTests testWrite newACR1000.nema r; # == gdcmMR-SIEMENS-16.acr2 +gdcmCxxTests testWrite newACR1000.nema r; # == gdcmMR-SIEMENS-16.acr2 affim filein=newACR1000.nema.RAW DIMX=512 DIMY=512 nbit=16 -gdcmTests testWrite oldACR00001.ima r; # == gdcm-MR-SIEMENS.16.acr1 +gdcmCxxTests testWrite oldACR00001.ima r; # == gdcm-MR-SIEMENS.16.acr1 affim filein=oldACR00001.ima.RAW DIMX=256 DIMY=256 nbit=16 -gdcmTests testWrite OT-MONO2-8-a7.dcm r; +gdcmCxxTests testWrite OT-MONO2-8-a7.dcm r; affim filein=OT-MONO2-8-a7.dcm.RAW DIMX=512 DIMY=512 #No Samples Per Pixel #-------------------- -gdcmTests testWrite gdcm-CR-DCMTK-16-NonSamplePerPix.dcm r; +gdcmCxxTests testWrite gdcm-CR-DCMTK-16-NonSamplePerPix.dcm r; affim filein=gdcm-CR-DCMTK-16-NonSamplePerPix.dcm.RAW dim=750 nbit=8 #Unnormalized Rectangular LibIDO format image #-------------------------------------------- -gdcmTests testWrite gdcm-ACR-LibIDO.acr r; +gdcmCxxTests testWrite gdcm-ACR-LibIDO.acr r; affim filein=gdcm-ACR-LibIDO.acr.RAW dimx=512 dimy=301 #Bits Allocated =12, Bits Stored=12 #---------------------------------- #MR Philips (once upon a time in Lyon-Sud) -gdcmTests testWrite MR-MONO2-12-angio-an1.acr1 r; +gdcmCxxTests testWrite MR-MONO2-12-angio-an1.acr1 r; affim filein=MR-MONO2-12-angio-an1.acr1.RAW dim=256 nbit=16 #RGB #--- -gdcmTests testWrite US.3405.1.dcm r; +gdcmCxxTests testWrite US.3405.1.dcm r; echo "expected pixelType=8U SamplesPerPixel=1 PlanarConfiguration=0" echo " PhotometricInterpretation=RGB" affim filein=US.3405.1.dcm.RAW DIMX=768 DIMY=576 nbit=24 -gdcmTests testWrite OT-PAL-8-face.dcm r; +gdcmCxxTests testWrite OT-PAL-8-face.dcm r; echo "expected pixelType=8U SamplesPerPixel=3 PlanarConfiguration=1" echo " PhotometricInterpretation=PALETTE COLOR" affim filein=OT-PAL-8-face.dcm.RAW dimx=640 dimy=480 nbit=24 -gdcmTests testWrite 8BitsUncompressedColor.dcm r; +gdcmCxxTests testWrite 8BitsUncompressedColor.dcm r; affim filein=8BitsUncompressedColor.dcm.RAW dimx=800 dimy=535 nbit=24 # Implicit VR - Little Endian #----------------------------- -gdcmTests testWrite CT-MONO2-16-ankle.dcm r; +gdcmCxxTests testWrite CT-MONO2-16-ankle.dcm r; affim filein=CT-MONO2-16-ankle.dcm.RAW DIMX=512 DIMY=512 nbit=16 signe=o -gdcmTests testWrite CT-MONO2-16-ort.dcm r; +gdcmCxxTests testWrite CT-MONO2-16-ort.dcm r; affim filein=CT-MONO2-16-ort.dcm.RAW DIMX=512 DIMY=512 nbit=16 signe=o -gdcmTests testWrite CT-MONO2-8-abdo.dcm r; +gdcmCxxTests testWrite CT-MONO2-8-abdo.dcm r; affim filein=CT-MONO2-8-abdo.dcm.RAW DIMX=512 DIMY=512 -gdcmTests testWrite gdcm-MR-PHILIPS-16.dcm r; +gdcmCxxTests testWrite gdcm-MR-PHILIPS-16.dcm r; affim filein=gdcm-MR-PHILIPS-16.dcm.RAW DIMX=256 DIMY=256 nbit=16 -gdcmTests testWrite MR-MONO2-16-head.dcm r; +gdcmCxxTests testWrite MR-MONO2-16-head.dcm r; affim filein=MR-MONO2-16-head.dcm.RAW dim=256 nbit=16 signe=o -gdcmTests testWrite multiframe1Integris.dcm r; +gdcmCxxTests testWrite multiframe1Integris.dcm r; affim filein=multiframe1Integris.dcm.RAW dim=1024 nbit=16 zoom=-2 affim filein=multiframe1Integris.dcm.RAW dim=1024 nbit=16 offset=31457280 zoom=-2 -gdcmTests testWrite multiframe2GE.dcm r; +gdcmCxxTests testWrite multiframe2GE.dcm r; affim filein=multiframe2GE.dcm.RAW dim=512 affim filein=multiframe2GE.dcm.RAW dim=512 offset=14417920 -gdcmTests testWrite irmPhlipsNew1.dcm r; # == gdcm-MR-PHILIPS-16.dcm +gdcmCxxTests testWrite irmPhlipsNew1.dcm r; # == gdcm-MR-PHILIPS-16.dcm affim DIMX=256 DIMY=256 filein=irmPhlipsNew1.dcm.RAW nbit=16 #avec imagette (icone) -gdcmTests testWrite icone.dcm r; +gdcmCxxTests testWrite icone.dcm r; affim filein=icone.dcm bypassacr=1 dim=512 nbit=16 offset=18240 affim filein=icone.dcm dim=64 offset=13984 bypassacr=1 affim filein=icone.dcm.RAW dim=512 nbit=16 @@ -125,40 +125,40 @@ affim filein=icone.dcm.RAW dim=512 nbit=16 #Explicit VR - Little Endian #---------------------------- -gdcmTests testWrite CT-MONO2-16-brain.dcm r; +gdcmCxxTests testWrite CT-MONO2-16-brain.dcm r; affim filein=CT-MONO2-16-brain.dcm.RAW DIMX=512 DIMY=512 nbit=16 signe=o # 7 'first level' SeQuences , 140 'second level' SeQuences ?!? -gdcmTests testWrite gdcm-MR-PHILIPS-16-Multi-Seq.dcm r; +gdcmCxxTests testWrite gdcm-MR-PHILIPS-16-Multi-Seq.dcm r; affim filein=gdcm-MR-PHILIPS-16-Multi-Seq.dcm.RAW DIMX=128 DIMY=128 nbit=16 PrintHeader gdcm-MR-PHILIPS-16-Multi-Seq.dcm 2 -gdcmTests testWrite gdcm-MR-PHILIPS-16-NonRectPix.dcm r; +gdcmCxxTests testWrite gdcm-MR-PHILIPS-16-NonRectPix.dcm r; affim filein=gdcm-MR-PHILIPS-16-NonRectPix.dcm.RAW DIMX=160 DIMY=64 nbit=16 -gdcmTests testWrite MR-MONO2-8-16x-heart.dcm r; +gdcmCxxTests testWrite MR-MONO2-8-16x-heart.dcm r; affim filein=MR-MONO2-8-16x-heart.dcm.RAW DIMX=256 DIMY=256 -gdcmTests testWrite NM-MONO2-16-13x-heart.dcm r; +gdcmCxxTests testWrite NM-MONO2-16-13x-heart.dcm r; affim filein=NM-MONO2-16-13x-heart.dcm.RAW DIMX=64 DIMY=64 nbit=16 affim filein=NM-MONO2-16-13x-heart.dcm.RAW DIMX=64 DIMY=64 nbit=16 offset=98304 -gdcmTests testWrite sonataMonaco.dcm r; +gdcmCxxTests testWrite sonataMonaco.dcm r; affim filein=sonataMonaco.dcm.RAW DIMX=256 DIMY=208 nbit=16 #MultiFrame -gdcmTests testWrite US-MONO2-8-8x-execho.dcm r; +gdcmCxxTests testWrite US-MONO2-8-8x-execho.dcm r; affim filein=US-MONO2-8-8x-execho.dcm.RAW DIMX=128 DIMY=120 affim filein=US-MONO2-8-8x-execho.dcm.RAW DIMX=128 DIMY=120 offset=92160 #RGB -gdcmTests testWrite US-RGB-8-epicard.dcm r; +gdcmCxxTests testWrite US-RGB-8-epicard.dcm r; echo "expected pixelType=8U SamplesPerPixel=3 PlanarConfiguration=1" echo " PhotometricInterpretation=RGB" affim filein=US-RGB-8-epicard.dcm.RAW dimx=640 dimy=480 nbit=24 -gdcmTests testWrite US-RGB-8-esopecho.dcm r; +gdcmCxxTests testWrite US-RGB-8-esopecho.dcm r; echo "expected pixelType=8U SamplesPerPixel=3 PlanarConfiguration=0" echo " PhotometricInterpretation=RGB" affim filein=US-RGB-8-esopecho.dcm.RAW dimx=256 dimy=120 nbit=24 @@ -167,57 +167,57 @@ affim filein=US-RGB-8-esopecho.dcm.RAW dimx=256 dimy=120 nbit=24 #-------------------------------------------------------------------------- # (JPEG Lossless) -gdcmTests testWrite CT-MONO2-16-chest.dcm r; +gdcmCxxTests testWrite CT-MONO2-16-chest.dcm r; affim filein=CT-MONO2-16-chest.dcm.RAW dimx=512 dimy=400 nbit=16 signe=o -gdcmTests testWrite 012345.002.050.dcm r; +gdcmCxxTests testWrite 012345.002.050.dcm r; affim filein=012345.002.050.dcm.RAW dim=256 nbit=16 -gdcmTests testWrite gdcm-JPEG-LossLess3a.dcm r; +gdcmCxxTests testWrite gdcm-JPEG-LossLess3a.dcm r; affim filein=gdcm-JPEG-LossLess3a.dcm.RAW dim=512 nbit=16 -gdcmTests testWrite XA-MONO2-8-12x-catheter.dcm r; +gdcmCxxTests testWrite XA-MONO2-8-12x-catheter.dcm r; affim filein=XA-MONO2-8-12x-catheter.dcm.RAW dim=512; affim filein=XA-MONO2-8-12x-catheter.dcm.RAW dim=512 offset=262144 affim filein=XA-MONO2-8-12x-catheter.dcm.RAW dim=512 offset=2883584 -gdcmTests testWrite xa_integris.dcm r; +gdcmCxxTests testWrite xa_integris.dcm r; echo "a lot of fragments expected here" affim filein=xa_integris.dcm.RAW dim=512 affim filein=xa_integris.dcm.RAW dim=512 offset=13107200 affim filein=xa_integris.dcm.RAW dim=512 offset=19660800 -gdcmTests testWrite 16BitsJpegLosslessGrayScale.dcm r; +gdcmCxxTests testWrite 16BitsJpegLosslessGrayScale.dcm r; affim filein=16BitsJpegLosslessGrayScale.dcm.RAW DIMX=800 DIMY=535 nbit=16 #comming from GE dlx via VTServer -gdcmTests testWrite I9000001.dcm r; +gdcmCxxTests testWrite I9000001.dcm r; affim filein=I9000001.dcm.RAW dim=512 affim filein=I9000001.dcm.RAW dim=512 offset=7864320 #JPEG Extended (Process 2 & 4) // 16 bits #----------------------------- -gdcmTests testWrite gdcm-JPEG-Extended.dcm r; +gdcmCxxTests testWrite gdcm-JPEG-Extended.dcm r; affim filein=gdcm-JPEG-Extended.dcm.RAW dim=512 nbit=16 -gdcmTests testWrite jpeglossy1.dcm r; +gdcmCxxTests testWrite jpeglossy1.dcm r; affim filein=jpeglossy1.dcm.RAW dim=512 nbit=16 #JPEG Baseline (Process 14) #-------------------------- -gdcmTests testWrite MR-MONO2-12-shoulder.dcm r; +gdcmCxxTests testWrite MR-MONO2-12-shoulder.dcm r; affim filein=MR-MONO2-12-shoulder.dcm.RAW DIMX=1024 DIMY=1024 nbit=16 #fichier format ecat. -#gdcmTests testWrite imageEcat.ecat r +#gdcmCxxTests testWrite imageEcat.ecat r #JPEG Lossy 8 bits #================= #JPEG Baseline (Process 1) #------------------------- # Bracco Files -gdcmTests testWrite US.1.2.dcm r; +gdcmCxxTests testWrite US.1.2.dcm r; echo "expected : A lot of Fragments (40), nb Frames = 40 ;-)" echo "expected pixelType=8U SamplesPerPixel=3 PlanarConfiguration=0" echo " PhotometricInterpretation=YBR_FULL_422" @@ -226,7 +226,7 @@ affim filein=US.1.2.dcm.RAW DIMX=768 DIMY=576 nbit=24 offset=13271040 affim filein=US.1.2.dcm.RAW DIMX=768 DIMY=576 nbit=24 offset=39813120 #Sequoia Acusson U11 -gdcmTests testWrite CLIP0001-Sequoia-U11.dcm r; +gdcmCxxTests testWrite CLIP0001-Sequoia-U11.dcm r; echo "Troubles with 0018|6022[SL][Reference Pixel Y(0)] [4294967177] x(7fffffff)" affim filein=CLIP0001-Sequoia-U11.dcm.RAW DIMX=768 DIMY=576 nbit=24 @@ -236,24 +236,24 @@ affim filein=CLIP0001-Sequoia-U11.dcm.RAW DIMX=768 DIMY=576 nbit=24 offset=265 #RLE Lossless #------------- -gdcmTests testWrite canadaAloka.dcm r; +gdcmCxxTests testWrite canadaAloka.dcm r; echo "expected pixelType=8U SamplesPerPixel=1" echo " PlanarConfiguration=0 PhotometricInterpretation=MONOCHROME2" echo " nb Frames (DIMZ) : 1" affim filein=canadaAloka.dcm.RAW DIMX=608 DIMY=420 -gdcmTests testWrite FMAG0001.dcm r; +gdcmCxxTests testWrite FMAG0001.dcm r; echo "expected pixelType=8U SamplesPerPixel=3" echo " PlanarConfiguration=1 PhotometricInterpretation=YBR_FULL" echo " nb Frames (DIMZ) : 1" affim filein=FMAG0001.dcm.RAW DIMX=768 DIMY=576 nbit=24 -gdcmTests testWrite QMAG0001.dcm r; +gdcmCxxTests testWrite QMAG0001.dcm r; echo "expected pixelType=8U SamplesPerPixel=3" echo " PlanarConfiguration=1 PhotometricInterpretation=YBR_FULL" affim filein=QMAG0001.dcm.RAW DIMX=384 DIMY=288 nbit=24; -gdcmTests testWrite US-PAL-8-10x-echo.dcm r; +gdcmCxxTests testWrite US-PAL-8-10x-echo.dcm r; echo "expected pixelType=8U SamplesPerPixel=1 PlanarConfiguration=0" echo " PhotometricInterpretation=PALETTE COLOR" echo " nb Frames (DIMZ): 10" @@ -264,11 +264,11 @@ affim filein=US-PAL-8-10x-echo.dcm.RAW DIMX=600 DIMY=430 nbit=24 offset=774000 affim filein=US-PAL-8-10x-echo.dcm.RAW DIMX=600 DIMY=430 nbit=24 offset=1548000 affim filein=US-PAL-8-10x-echo.dcm.RAW DIMX=600 DIMY=430 nbit=24 offset=6966000 -gdcmTests testWrite 8BitsRunLengthGrayScale.dcm r; +gdcmCxxTests testWrite 8BitsRunLengthGrayScale.dcm r; echo "expected : correct Gray image" affim filein=8BitsRunLengthGrayScale.dcm.RAW DIMX=800 DIMY=535 -gdcmTests testWrite 8BitsRunLengthColor.dcm r; +gdcmCxxTests testWrite 8BitsRunLengthColor.dcm r; echo "expected pixelType=8U SamplesPerPixel=1 PlanarConfiguration=2" echo " PhotometricInterpretation=PALETTE COLOR" echo "expected correct color image" @@ -276,7 +276,7 @@ affim filein=8BitsRunLengthColor.dcm.RAW DIMX=800 DIMY=535 nbit=24 #RLE 16 bits --> Try to find some more images -gdcmTests testWrite 16BitsRunLengthGrayScale.dcm r; +gdcmCxxTests testWrite 16BitsRunLengthGrayScale.dcm r; echo "expected pixelType=16U SamplesPerPixel=1 PlanarConfiguration=0" echo " PhotometricInterpretation=MONOCHROME2" affim filein=16BitsRunLengthGrayScale.dcm.RAW DIMX=800 DIMY=535 nbit=16 @@ -285,47 +285,47 @@ affim filein=16BitsRunLengthGrayScale.dcm.RAW DIMX=800 DIMY=535 nbit=16 #-------------------------- #(break xmedcon) -gdcmTests testWrite 00191113.dcm r; +gdcmCxxTests testWrite 00191113.dcm r; affim filein=00191113.dcm.RAW DIMX=512 DIMY=512 affim filein=00191113.dcm.RAW DIMX=512 DIMY=512 offset=786432 -gdcmTests testWrite DermaColorLossLess.dcm r; +gdcmCxxTests testWrite DermaColorLossLess.dcm r; affim filein=DermaColorLossLess.dcm.RAW DIMX=117 DIMY=181 nbit=24 -gdcmTests testWrite RadBWLossLess.dcm r; +gdcmCxxTests testWrite RadBWLossLess.dcm r; affim filein=RadBWLossLess.dcm.RAW DIMX=136 DIMY=92 nbit=16 -gdcmTests testWrite Wrist.pap r +gdcmCxxTests testWrite Wrist.pap r affim filein=Wrist.pap.RAW nbit=16 dimx=720 dimy=360 #Known as BUGGED ! #---------------- #Rectangular old 24 Bits image -gdcmTests testWrite gdcm-RGB-LibIDORect.acr r; +gdcmCxxTests testWrite gdcm-RGB-LibIDORect.acr r; affim filein=gdcm-RGB-LibIDORect.acr.RAW DIMX=400 DIMY=100 nbit=24 #MR GE GENESIS_SIGNA Palo Alto -gdcmTests testWrite DicomSampleNastyGEImage.dcm r; +gdcmCxxTests testWrite DicomSampleNastyGEImage.dcm r; echo "WAS expected : wrong lenth (13) for 0008|103e" affim filein=DicomSampleNastyGEImage.dcm.RAW DIMX=256 DIMY=256 nbit=16 #MR Philips NTSCAN Hop. Neuro Lyon -gdcmTests testWrite philipsMR-lossy.ima r; +gdcmCxxTests testWrite philipsMR-lossy.ima r; echo "WAS expected : 'Bogus Huffman table definition' on philipsMR-lossy.ima" -echo "IS expected : 'JERR_BAD_HUFF_TABLE sym 16 (>15') but the show goes on" +echo "IS expected : 'JERR_BAD_HUFF_TABLE sym 16 (>15)' but the show goes on" echo "breaks xmedcon" affim filein=philipsMR-lossy.ima.RAW dim=512 nbit=16 #CT Siemens Hop. Salengro Lille -gdcmTests testWrite gdcm-JPEG-LossLess3a.dcm r; +gdcmCxxTests testWrite gdcm-JPEG-LossLess3a.dcm r; echo "expected : wrong sequence delimiter (b00c,0eb6) at end of pixels"; echo "xmedcon says 'error: Unexpected end of file'" affim filein=gdcm-JPEG-LossLess3a.dcm.RAW dim=512 nbit=16 vtkgdcmViewer gdcm-JPEG-LossLess3a.dcm #CR Philips Thoravision Hop Cardio Lyon -gdcmTests testWrite gdcm-JPEG-LossLessThoravision.dcm r; +gdcmCxxTests testWrite gdcm-JPEG-LossLessThoravision.dcm r; echo "expected : 147 fragments,length : 29860 + 145*32760 + 14416" echo "breaks xmedcom, breaks e-film" echo "WAS expected : hashed image -with jLBJpeg-" @@ -333,12 +333,12 @@ echo "IS expected : Seg Fault" affim filein=gdcm-JPEG-LossLessThoravision.dcm.RAW DIMX=1876 DIMY=2076 nbit=16 #MR Picker ST. ANTHONY HOSPITAL -gdcmTests testWrite MR.6799.1.dcm r; +gdcmCxxTests testWrite MR.6799.1.dcm r; echo "OK; DICOM Image with NO Preamble" affim filein=MR.6799.1.dcm.RAW dim=512 nbit=16 #Segmented Palette Color LUT Data -gdcmTests testWrite gdcm-US-ALOKA-16.dcm r; +gdcmCxxTests testWrite gdcm-US-ALOKA-16.dcm r; echo "expected pixelType=16U SamplesPerPixel=1 PlanarConfiguration=0" echo " PhotometricInterpretation=PALETTE COLOR" echo "expected : Gray image since 'Segmented xxx Palette Color LUT Data' not yet taken into account" @@ -349,15 +349,15 @@ vtkgdcmViewer gdcm-US-ALOKA-16.dcm affim dimx=640 dimy=480 filein=gdcm-US-ALOKA-16.dcm.RAW nbit=16 # bugged Siemens 'Leonardo' image -gdcmTests testWrite 8078283Leonardo.dcm r; +gdcmCxxTests testWrite 8078283Leonardo.dcm r; affim filein=8078283Leonardo.dcm.RAW dim=512 nbit=16 #CT McTwin Elscint C.H.R.U LILLE C.HURIEZ -gdcmTests testWrite MxTwinLossLess.dcm r; +gdcmCxxTests testWrite MxTwinLossLess.dcm r; affim filein=MxTwinLossLess.dcm.RAW DIMX=512 DIMY=512 nbit=16 # MRI image from VPRO burned CD -gdcmTests testWrite mriThruVPRO.dcm r; +gdcmCxxTests testWrite mriThruVPRO.dcm r; affim filein=mriThruVPRO.dcm.RAW DIMX=256 DIMY=256 nbit=16 echo "expected : tasteless SHIT !" echo "breaks Siemens Leonardo viewer . JPEG encoding is bugged?" @@ -365,5 +365,5 @@ echo "breaks Siemens Leonardo viewer . JPEG encoding is bugged?" # gdcm made Theralys image # due to H table, a SeQuence is tagged with 0 length # when using gdcmFile::WriteDcmXXX -gdcmTests testWrite fromTheralys.dcm r; +gdcmCxxTests testWrite fromTheralys.dcm r; affim filein=fromTheralys.dcm.RAW dim=256 nbit=16 diff --git a/checkReadColor.sh b/checkReadColor.sh index b0c2fb3..c0b9d4d 100644 --- a/checkReadColor.sh +++ b/checkReadColor.sh @@ -8,31 +8,31 @@ #RGB --- -testWrite 8BitsUncompressedColor.dcm r +gdcmxxTests gdcmxxTests testWrite 8BitsUncompressedColor.dcm r affim filein=8BitsUncompressedColor.dcm.raw dimx=800 dimy=535 nbit=24 -testWrite US-RGB-8-epicard.dcm r +gdcmxxTests testWrite US-RGB-8-epicard.dcm r echo "expected pixelType=8U SamplesPerPixel=3 PlanarConfiguration=1" echo " PhotometricInterpretation=RGB" affim filein=US-RGB-8-epicard.dcm.raw dimx=640 dimy=480 nbit=24 -testWrite US-RGB-8-esopecho.dcm r +gdcmxxTests testWrite US-RGB-8-esopecho.dcm r echo "expected pixelType=8U SamplesPerPixel=3 PlanarConfiguration=0" echo " PhotometricInterpretation=RGB" affim filein=US-RGB-8-esopecho.dcm.raw dimx=256 dimy=120 nbit=24 -testWrite gdcm-RGB-LibIDORect.acr r +gdcmxxTests testWrite gdcm-RGB-LibIDORect.acr r affim filein=gdcm-RGB-LibIDORect.acr.raw DIMX=400 DIMY=100 nbit=24 #YBR_FULL_422 #------------ -testWrite US.3405.1.dcm r # YBR_FULL_422 +gdcmxxTests testWrite US.3405.1.dcm r # YBR_FULL_422 echo "expected pixelType=8U SamplesPerPixel=1 PlanarConfiguration=0" echo " PhotometricInterpretation=RGB" affim filein=US.3405.1.dcm.raw DIMX=768 DIMY=576 nbit=24 -testWrite US.1.2.dcm r +gdcmxxTests testWrite US.1.2.dcm r echo "expected : A lot of Fragments (40), nb Frames = 40 ;-)" echo "expected pixelType=8U SamplesPerPixel=3 PlanarConfiguration=0" echo " PhotometricInterpretation=YBR_FULL_422" @@ -44,7 +44,7 @@ affim filein=US.1.2.dcm.raw DIMX=768 DIMY=576 nbit=24 offset=39813120 #PALETTE COLOR #------------- -testWrite gdcm-US-ALOKA-16.dcm r +gdcmxxTests testWrite gdcm-US-ALOKA-16.dcm r echo "expected pixelType=16U SamplesPerPixel=1 PlanarConfiguration=0" echo " PhotometricInterpretation=PALETTE COLOR" echo "expected : Gray image since 'Segmented xxx Palette Color LUT Data' not yet taken into account" @@ -54,7 +54,7 @@ ls -l gdcm-US-ALOKA-16.dcm* echo "expected 1843200 (large enough to hold 3 16-bits planes)" affim dimx=640 dimy=480 filein=gdcm-US-ALOKA-16.dcm.raw nbit=16 -testWrite US-PAL-8-10x-echo.dcm r +gdcmxxTests testWrite US-PAL-8-10x-echo.dcm r echo "expected pixelType=8U SamplesPerPixel=1 PlanarConfiguration=0" echo " PhotometricInterpretation=PALETTE COLOR" echo " nb Frames (DIMZ): 10" @@ -63,20 +63,20 @@ echo " Reading 10 'single fragment' Segments (ouf!)" affim filein=US-PAL-8-10x-echo.dcm.raw DIMX=600 DIMY=430 nbit=24 affim filein=US-PAL-8-10x-echo.dcm.raw DIMX=600 DIMY=430 nbit=24 offset=774000 -testWrite 8BitsRunLengthColor.dcm r +gdcmxxTests testWrite 8BitsRunLengthColor.dcm r echo "expected pixelType=8U SamplesPerPixel=1 PlanarConfiguration=2" echo " PhotometricInterpretation=PALETTE COLOR" echo "expected correct color image" affim filein=8BitsRunLengthColor.dcm.raw DIMX=800 DIMY=535 nbit=24 -testWrite OT-PAL-8-face.dcm r +gdcmxxTests testWrite OT-PAL-8-face.dcm r echo "expected pixelType=8U SamplesPerPixel=3 PlanarConfiguration=1" echo " PhotometricInterpretation=PALETTE COLOR" affim filein=OT-PAL-8-face.dcm.raw dimx=640 dimy=480 nbit=24 #YBR_FULL #-------- -testWrite FMAG0001.dcm r +gdcmxxTests testWrite FMAG0001.dcm r echo "expected pixelType=8U SamplesPerPixel=3" echo " PlanarConfiguration=1 PhotometricInterpretation=YBR_FULL" echo " nb Frames (DIMZ) : 1" @@ -84,7 +84,7 @@ ls -l FMAG0001.dcm.raw affim filein=FMAG0001.dcm.raw DIMX=768 DIMY=576 nbit=24 -testWrite QMAG0001.dcm r +gdcmxxTests testWrite QMAG0001.dcm r echo "expected pixelType=8U SamplesPerPixel=3" echo " PlanarConfiguration=1 PhotometricInterpretation=YBR_FULL" ls -l QMAG0001.dcm.raw @@ -94,42 +94,42 @@ affim filein=QMAG0001.dcm.raw DIMX=384 DIMY=288 nbit=24; # http://www.leadtools.com/SDK/Medical/DICOM/ltdc19.htm #------------------------------------------------------ -testWrite 8BitsJpegLossyGrayScale.dcm r +gdcmxxTests testWrite 8BitsJpegLossyGrayScale.dcm r affim filein=8BitsJpegLossyGrayScale.dcm.raw DIMX=800 DIMY=535 -testWrite 8BitsRunLengthColor.dcm r +gdcmxxTests testWrite 8BitsRunLengthColor.dcm r affim filein=8BitsRunLengthColor.dcm.raw DIMX=800 DIMY=535 nbit=24 -testWrite 8BitsRunLengthGrayScale.dcm r +gdcmxxTests testWrite 8BitsRunLengthGrayScale.dcm r affim filein=8BitsRunLengthGrayScale.dcm.raw DIMX=800 DIMY=535 -testWrite 8BitsUncompressedColor.dcm r +gdcmxxTests testWrite 8BitsUncompressedColor.dcm r affim filein=8BitsUncompressedColor.dcm.raw DIMX=800 DIMY=535 nbit=24 -testWrite 8BitsUncompressedGrayScale.dcm r +gdcmxxTests testWrite 8BitsUncompressedGrayScale.dcm r affim filein=8BitsUncompressedGrayScale.dcm.raw DIMX=800 DIMY=535 -testWrite 16BitsJpegLosslessGrayScale.dcm r +gdcmxxTests testWrite 16BitsJpegLosslessGrayScale.dcm r affim filein=16BitsJpegLosslessGrayScale.dcm.raw DIMX=800 DIMY=535 nbit=16 -testWrite 16BitsRunLengthGrayScale.dcm r +gdcmxxTests testWrite 16BitsRunLengthGrayScale.dcm r echo "expected pixelType=16U SamplesPerPixel=1 PlanarConfiguration=2" echo " PhotometricInterpretation=MONOCHROME2" affim filein=16BitsRunLengthGrayScale.dcm.raw DIMX=800 DIMY=535 nbit=16 -testWrite 16BitsUncompressedGrayScale.dcm r +gdcmxxTests testWrite 16BitsUncompressedGrayScale.dcm r affim filein=16BitsUncompressedGrayScale.dcm.raw DIMX=800 DIMY=535 nbit=16 -testWrite 24BitsJpegLosslessColor.dcm r +gdcmxxTests testWrite 24BitsJpegLosslessColor.dcm r echo "expected DIMX=800 DIMY=535 DIMZ=1 " echo " pixelType=8U SamplesPerPixel=3 PlanarConfiguration=0" echo " PhotometricInterpretation=RGB " affim filein=24BitsJpegLosslessColor.dcm.raw DIMX=800 DIMY=535 nbit=24 -testWrite 24BitsJpegLossyColor.dcm r +gdcmxxTests testWrite 24BitsJpegLossyColor.dcm r affim filein=24BitsJpegLossyColor.dcm.raw DIMX=800 DIMY=535 nbit=24 -testWrite 24BitsUncompressedColor.dcm r +gdcmxxTests testWrite 24BitsUncompressedColor.dcm r affim filein=24BitsUncompressedColor.dcm.raw DIMX=800 DIMY=535 nbit=24 diff --git a/checkSequences.sh b/checkSequences.sh index d629efe..bd558cd 100644 --- a/checkSequences.sh +++ b/checkSequences.sh @@ -1,73 +1,73 @@ # use : -../../gdcm/bin/gdcmTests PrintHeader mriThruVPRO.dcm 2 new | more +../../gdcm/bin/gdcmCxxTests PrintHeader mriThruVPRO.dcm 2 new | more # Horror Picture Show # ------------------- -gdcmTests PrintHeader gdcm-MR-PHILIPS-16-Multi-Seq.dcm # 400 SQ, embedded SQ +gdcmCxxTests PrintHeader gdcm-MR-PHILIPS-16-Multi-Seq.dcm # 400 SQ, embedded SQ # with O length sequ -gdcmTests PrintHeader gdcm-MR-PHILIPS-16-NonRectPix.dcm # 22 SQ, embedded SQ +gdcmCxxTests PrintHeader gdcm-MR-PHILIPS-16-NonRectPix.dcm # 22 SQ, embedded SQ # with O length sequ -gdcmTests PrintHeader mriThruVPRO.dcm # 7 SQ ffffffff length +gdcmCxxTests PrintHeader mriThruVPRO.dcm # 7 SQ ffffffff length # with O length sequ -gdcmTests PrintHeader MxTwinLossLess.dcm # 0088|0200 x(59c) [Icon Image Sequence] +gdcmCxxTests PrintHeader MxTwinLossLess.dcm # 0088|0200 x(59c) [Icon Image Sequence] # with O length sequ -gdcmTests PrintHeader icone.dcm # SQ ffffffff length +gdcmCxxTests PrintHeader icone.dcm # SQ ffffffff length # 0008|2112 x(264) [Source Image Sequence] # with 130 useless Items (?!) # 0088|0200 x(362a) [Icon Image Sequence] # with Item Delimitation Item e00d # with Sequence Delimitation Item e0dd -gdcmTests PrintHeader Wrist.pap # PAPYRUS 3.0 image +gdcmCxxTests PrintHeader Wrist.pap # PAPYRUS 3.0 image # Peacefull images # ---------------- -gdcmTests PrintHeader canadaAloka.dcm # 0018|6011 x(2f6) [Sequence of Ultrasound Regions ] ffff +gdcmCxxTests PrintHeader canadaAloka.dcm # 0018|6011 x(2f6) [Sequence of Ultrasound Regions ] ffff -gdcmTests PrintHeader CLIP0001-Sequoia-U11.dcm # 0018|6011 [Sequence of Ultrasound Regions ] +gdcmCxxTests PrintHeader CLIP0001-Sequoia-U11.dcm # 0018|6011 [Sequence of Ultrasound Regions ] -gdcmTests PrintHeader cr172241.dcm # 0028|3000 x(344) [Modality LUT Sequence] +gdcmCxxTests PrintHeader cr172241.dcm # 0028|3000 x(344) [Modality LUT Sequence] -gdcmTests PrintHeader fromTheralys.dcm # 0008|1140 x(2f1) [Referenced Image Sequence] +gdcmCxxTests PrintHeader fromTheralys.dcm # 0008|1140 x(2f1) [Referenced Image Sequence] # ???? -gdcmTests PrintHeader gdcm-CR-DCMTK-16-NonSamplePerPix.dcm # 0008|1140 x(39a) [Referenced Image Sequence] +gdcmCxxTests PrintHeader gdcm-CR-DCMTK-16-NonSamplePerPix.dcm # 0008|1140 x(39a) [Referenced Image Sequence] # 0008|2112 x(440) [Source Image Sequence] -gdcmTests PrintHeader gdcm-JPEG-Extended.dcm # ffff 0008|1140 x(39a) [Referenced Image Sequence] +gdcmCxxTests PrintHeader gdcm-JPEG-Extended.dcm # ffff 0008|1140 x(39a) [Referenced Image Sequence] # ffff 0008|2112 x(440) [Source Image Sequence] -gdcmTests PrintHeader gdcm-JPEG-LossLess3a.dcm # 0008|2112 x(378) [Source Image Sequence] +gdcmCxxTests PrintHeader gdcm-JPEG-LossLess3a.dcm # 0008|2112 x(378) [Source Image Sequence] -gdcmTests PrintHeader gdcm-MR-PHILIPS-16.dcm # 0008|1140 x(33c) [Referenced Image Sequence] +gdcmCxxTests PrintHeader gdcm-MR-PHILIPS-16.dcm # 0008|1140 x(33c) [Referenced Image Sequence] -gdcmTests PrintHeader I9000001.dcm # ffff 0028|6100 x(c0e) [Mask Subtraction Sequence] +gdcmCxxTests PrintHeader I9000001.dcm # ffff 0028|6100 x(c0e) [Mask Subtraction Sequence] # ffff 0050|0010 x(c74) [Device Sequence] -gdcmTests PrintHeader multiframe2GE.dcm # 0028|6100 x(3e) [Mask Subtraction Sequence] +gdcmCxxTests PrintHeader multiframe2GE.dcm # 0028|6100 x(3e) [Mask Subtraction Sequence] # 0050|0010 x(3c) [Device Sequence] -gdcmTests PrintHeader irmPhlipsNew1.dcm # 0008|1140 x(33c) [Referenced Image Sequence] +gdcmCxxTests PrintHeader irmPhlipsNew1.dcm # 0008|1140 x(33c) [Referenced Image Sequence] -gdcmTests PrintHeader multiframe1Integris.dcm # 0028|3000 x(66c) [Modality LUT Sequence] +gdcmCxxTests PrintHeader multiframe1Integris.dcm # 0028|3000 x(66c) [Modality LUT Sequence] -gdcmTests PrintHeader QMAG0001.dcm # 0008|2112 x(2ac) [Source Image Sequence] +gdcmCxxTests PrintHeader QMAG0001.dcm # 0008|2112 x(2ac) [Source Image Sequence] # 0018|6011 x(3b6) [Sequence of Ultrasound Regions ] -gdcmTests PrintHeader US.1.2.dcm # 0018|6011 x(4b8) [Sequence of Ultrasound Regions ] +gdcmCxxTests PrintHeader US.1.2.dcm # 0018|6011 x(4b8) [Sequence of Ultrasound Regions ] -gdcmTests PrintHeader sonataMonaco.dcm # 0008|1140 x(35a) [Referenced Image Sequence] +gdcmCxxTests PrintHeader sonataMonaco.dcm # 0008|1140 x(35a) [Referenced Image Sequence] -gdcmTests PrintHeader xa_integris.dcm # 0008|1111 x(32c) [Referenced Performed Procedure Step Sequence] +gdcmCxxTests PrintHeader xa_integris.dcm # 0008|1111 x(32c) [Referenced Performed Procedure Step Sequence] # 0029|fd00 x(674) [unkn] -gdcmTests PrintHeader E00001S03I0015.dcm # 0008|1111 x(342) [Referenced Performed Procedure Step Sequence] [] +gdcmCxxTests PrintHeader E00001S03I0015.dcm # 0008|1111 x(342) [Referenced Performed Procedure Step Sequence] [] # 0008|1140 x(3ac) [Referenced Image Sequence] diff --git a/checkWriteExplicit.sh b/checkWriteExplicit.sh index 5022146..b602c4c 100644 --- a/checkWriteExplicit.sh +++ b/checkWriteExplicit.sh @@ -23,8 +23,8 @@ #No Swap Info #------------ -gdcmTests testWrite mr176621.dcm x; -gdcmTests PrintHeader mr176621.dcm.XDCM 2; . +gdcmCxxTests testWrite mr176621.dcm x; +gdcmCxxTests PrintHeader mr176621.dcm.XDCM 2; . vtkgdcmViewer mr176621.dcm.XDCM; # OK xmedcon mr176621.dcm.XDCM; # warning: No transfer syntax found # warning: Tag with uneven length @@ -40,99 +40,98 @@ xmedcon mr176621.dcm.XDCM; # warning: No transfer syntax found # ------------------------------------------- BIG SOUCY !! affimdcm filein=cr172241.dcm zoom=-4; xmedcon cr172241.dcm; # OK - -gdcmTests testWrite cr172241.dcm r; +gdcmCxxTests testWrite cr172241.dcm r; affim filein=cr172241.dcm.RAW nbit=16 DIMX=1792 DIMY=2392; -gdcmTests PrintHeader cr172241.dcm 2; #OK +gdcmCxxTests PrintHeader cr172241.dcm 2; #OK # But ... : vtkgdcmViewer cr172241.dcm; # breaks (white image) WHITE IMAGE ?!? # Doesn't break DaVaW ... -gdcmTests testWrite cr172241.dcm x; -gdcmTests gdcmTests PrintHeader cr172241.dcm.XDCM 2; #OK +gdcmCxxTests testWrite cr172241.dcm x; +gdcmCxxTests PrintHeader cr172241.dcm.XDCM 2; #OK xmedcon cr172241.dcm.XDCM; # OK Incorrect OB value representation (fixed) affimdcm filein=cr172241.dcm.XDCM; # OK vtkgdcmViewer cr172241.dcm.XDCM; # breaks ?!? White image ! vtkgdcmViewer Wrist.pap; # PAPYRUS 3.0 single frame image -gdcmTests gdcmTests PrintHeader Wrist.pap 2; -gdcmTests testWrite Wrist.pap x; # OK -gdcmTests gdcmTests PrintHeader Wrist.pap.XDCM +gdcmCxxTests PrintHeader Wrist.pap 2; +gdcmCxxTests testWrite Wrist.pap x; # OK +gdcmCxxTests PrintHeader Wrist.pap.XDCM -gdcmTests testWrite cr_45031.dcm x; +gdcmCxxTests testWrite cr_45031.dcm x; vtkgdcmViewer cr_45031.dcm.XDCM; #OK xmedcon cr_45031.dcm.XDCM; #OK -gdcmTests testWrite CR-MONO1-10-chest.dcm x; -gdcmTests gdcmTests PrintHeader CR-MONO1-10-chest.dcm.XDCM 2; #OK +gdcmCxxTests testWrite CR-MONO1-10-chest.dcm x; +gdcmCxxTests PrintHeader CR-MONO1-10-chest.dcm.XDCM 2; #OK vtkgdcmViewer CR-MONO1-10-chest.dcm.XDCM; #OK xmedcon CR-MONO1-10-chest.dcm.XDCM; #OK Incorrect OB value representation (fixed) -gdcmTests testWrite CT-MONO2-12-lomb-an2.acr2 x; -gdcmTests gdcmTests PrintHeader CT-MONO2-12-lomb-an2.acr2.XDCM 2; # OK +gdcmCxxTests testWrite CT-MONO2-12-lomb-an2.acr2 x; +gdcmCxxTests PrintHeader CT-MONO2-12-lomb-an2.acr2.XDCM 2; # OK vtkgdcmViewer CT-MONO2-12-lomb-an2.acr2.XDCM; #OK xmedcon CT-MONO2-12-lomb-an2.acr2.XDCM; #OK Incorrect OB value representation (fixed) xmedcon gdcm-MR-SIEMENS-16.acr1; # Original OK -gdcmTests gdcmTests PrintHeader gdcm-MR-SIEMENS-16.acr1; #OK -gdcmTests testWrite gdcm-MR-SIEMENS-16.acr1 x; -gdcmTests gdcmTests PrintHeader gdcm-MR-SIEMENS-16.acr1.XDCM 2; +gdcmCxxTests PrintHeader gdcm-MR-SIEMENS-16.acr1; #OK +gdcmCxxTests testWrite gdcm-MR-SIEMENS-16.acr1 x; +gdcmCxxTests PrintHeader gdcm-MR-SIEMENS-16.acr1.XDCM 2; vtkgdcmViewer gdcm-MR-SIEMENS-16.acr1.XDCM; xmedcon gdcm-MR-SIEMENS-16.acr1.XDCM; #breaks error: No images found xmedcon gdcm-MR-SIEMENS-16.acr2 #original OK -gdcmTests testWrite gdcm-MR-SIEMENS-16.acr2 x; -gdcmTests gdcmTests PrintHeader gdcm-MR-SIEMENS-16.acr2.XDCM 2; +gdcmCxxTests testWrite gdcm-MR-SIEMENS-16.acr2 x; +gdcmCxxTests PrintHeader gdcm-MR-SIEMENS-16.acr2.XDCM 2; vtkgdcmViewer gdcm-MR-SIEMENS-16.acr2.XDCM; #OK xmedcon gdcm-MR-SIEMENS-16.acr2.XDCM; #breaks # --> TODO fix group length for odd groups#Feb 03 18:50:24 log[4419]: warning: No transfer syntax found #Feb 03 18:50:24 log[4419]: warning: Tag with uneven length #Feb 03 18:50:24 log[4419]: error: No images found -gdcmTests testWrite MR-MONO2-12-an2.acr2 x; -gdcmTests gdcmTests PrintHeader newACR1000.nema.XDCM 2; +gdcmCxxTests testWrite MR-MONO2-12-an2.acr2 x; +gdcmCxxTests PrintHeader newACR1000.nema.XDCM 2; vtkgdcmViewer MR-MONO2-12-an2.acr2.XDCM; xmedcon MR-MONO2-12-an2.acr2.XDCM; # OK warning: Incorrect OB value representation -gdcmTests testWrite newACR1000.nema x; # == gdcmMR-SIEMENS-16.acr2 -gdcmTests gdcmTests PrintHeader newACR1000.nema.XDCM; #OK +gdcmCxxTests testWrite newACR1000.nema x; # == gdcmMR-SIEMENS-16.acr2 +gdcmCxxTests PrintHeader newACR1000.nema.XDCM; #OK vtkgdcmViewer newACR1000.nema.XDCM; #OK xmedcon newACR1000.nema.XDCM; # breaks : no image found -gdcmTests testWrite oldACR00001.ima x; # == gdcm-MR-SIEMENS.16.acr1 -gdcmTests gdcmTests PrintHeader oldACR00001.ima.XDCM; # OK +gdcmCxxTests testWrite oldACR00001.ima x; # == gdcm-MR-SIEMENS.16.acr1 +gdcmCxxTests PrintHeader oldACR00001.ima.XDCM; # OK vtkgdcmViewer oldACR00001.ima.XDCM; #OK xmedcon oldACR00001.ima.XDCM; # breaks : no image found -gdcmTests testWrite OT-MONO2-8-a7.dcm x; +gdcmCxxTests testWrite OT-MONO2-8-a7.dcm x; vtkgdcmViewer OT-MONO2-8-a7.dcm.XDCM; #OK xmedcon OT-MONO2-8-a7.dcm.XDCM ; #OK #No Samples Per Pixel #-------------------- -gdcmTests testWrite gdcm-CR-DCMTK-16-NonSamplePerPix.dcm x; +gdcmCxxTests testWrite gdcm-CR-DCMTK-16-NonSamplePerPix.dcm x; affim filein=gdcm-CR-DCMTK-16-NonSamplePerPix.dcm; -gdcmTests gdcmTests PrintHeader gdcm-CR-DCMTK-16-NonSamplePerPix.dcm.XDCM 2; # OK +gdcmCxxTests PrintHeader gdcm-CR-DCMTK-16-NonSamplePerPix.dcm.XDCM 2; # OK vtkgdcmViewer gdcm-CR-DCMTK-16-NonSamplePerPix.dcm.XDCM; #OK xmedcon gdcm-CR-DCMTK-16-NonSamplePerPix.dcm.XDCM #OK #Unnormalized Rectangular LibIDO format image #-------------------------------------------- -gdcmTests testWrite gdcm-ACR-LibIDO.acr x; +gdcmCxxTests testWrite gdcm-ACR-LibIDO.acr x; vtkgdcmViewer gdcm-ACR-LibIDO.acr.XDCM; # OK xmedcon gdcm-ACR-LibIDO.acr.XDCM; #inverts x and y (of course) #Bits Allocated =12, Bits Stored=12 #---------------------------------- #MR Philips (once upon a time in Lyon-Sud) -gdcmTests testWrite MR-MONO2-12-angio-an1.acr1 x; +gdcmCxxTests testWrite MR-MONO2-12-angio-an1.acr1 x; vtkgdcmViewer MR-MONO2-12-angio-an1.acr1.XDCM; # shitty image xmedcon MR-MONO2-12-angio-an1.acr1.XDCM; # pas mieux : warning: Incorrect PixelData length #RGB #--- -gdcmTests testWrite US.3405.1.dcm x; +gdcmCxxTests testWrite US.3405.1.dcm x; echo "expected pixelType=8U SamplesPerPixel=1 PlanarConfiguration=0"; echo " PhotometricInterpretation=RGB"; vtkgdcmViewer US.3405.1.dcm.XDCM; #OK @@ -140,71 +139,71 @@ xmedcon US.3405.1.dcm.XDCM; #OK # ------------------------------------------- KING SIZE SOUCY !! -gdcmTests testWrite OT-PAL-8-face.dcm x; +gdcmCxxTests testWrite OT-PAL-8-face.dcm x; echo "expected pixelType=8U SamplesPerPixel=3 PlanarConfiguration=1"; echo " PhotometricInterpretation=PALETTE COLOR"; -gdcmTests gdcmTests PrintHeaderOT-PAL-8-face.dcm.XDCM; OK +gdcmCxxTests PrintHeaderOT-PAL-8-face.dcm.XDCM; OK affimdcm filein=OT-PAL-8-face.dcm.XDCM; #OK vtkgdcmViewer OT-PAL-8-face.dcm.XDCM; # seg fault .!? xmedcon OT-PAL-8-face.dcm.XDCM; #OK -gdcmTests testWrite 8BitsUncompressedColor.dcm x; +gdcmCxxTests testWrite 8BitsUncompressedColor.dcm x; vtkgdcmViewer 8BitsUncompressedColor.dcm.XDCM; # seg fault .!? xmedcon 8BitsUncompressedColor.dcm.XDCM ; #OK # Implicit VR - Little Endian #----------------------------- -gdcmTests testWrite CT-MONO2-16-ankle.dcm x; +gdcmCxxTests testWrite CT-MONO2-16-ankle.dcm x; xmedcon CT-MONO2-16-ankle.dcm.XDCM; #ok vtkgdcmViewer CT-MONO2-16-ankle.dcm.XDCM; #ok - gdcmTests gdcmTests PrintHeader CT-MONO2-16-ankle.dcm 2; #ok + gdcmCxxTests PrintHeader CT-MONO2-16-ankle.dcm 2; #ok -gdcmTests testWrite CT-MONO2-16-ort.dcm x; +gdcmCxxTests testWrite CT-MONO2-16-ort.dcm x; vtkgdcmViewer CT-MONO2-16-ort.dcm.XDCM; #OK xmedcon CT-MONO2-16-ort.dcm.XDCM; #OK -gdcmTests testWrite CT-MONO2-8-abdo.dcm x; +gdcmCxxTests testWrite CT-MONO2-8-abdo.dcm x; vtkgdcmViewer CT-MONO2-8-abdo.dcm.XDCM; #OK xmedcon CT-MONO2-8-abdo.dcm.XDCM; #OK -gdcmTests testWrite gdcm-MR-PHILIPS-16.dcm x; -gdcmTests gdcmTests PrintHeader gdcm-MR-PHILIPS-16.dcm.XDCM 2; #OK +gdcmCxxTests testWrite gdcm-MR-PHILIPS-16.dcm x; +gdcmCxxTests PrintHeader gdcm-MR-PHILIPS-16.dcm.XDCM 2; #OK vtkgdcmViewer gdcm-MR-PHILIPS-16.dcm.XDCM; # OK xmedcon gdcm-MR-PHILIPS-16.dcm.XDCM; # error: No images found xmedcon gdcm-MR-PHILIPS-16.dcm; # OK with original image -gdcmTests testWrite MR-MONO2-16-head.dcm x; +gdcmCxxTests testWrite MR-MONO2-16-head.dcm x; vtkgdcmViewer MR-MONO2-16-head.dcm.XDCM; #OK xmedcon MR-MONO2-16-head.dcm.XDCM; #OK -gdcmTests testWrite multiframe1Integris.dcm x; -gdcmTests gdcmTests PrintHeader CT-MONO2-8-abdo.dcm.XDCM 2; #OK +gdcmCxxTests testWrite multiframe1Integris.dcm x; +gdcmCxxTests PrintHeader CT-MONO2-8-abdo.dcm.XDCM 2; #OK vtkgdcmViewer multiframe1Integris.dcm.XDCM; #OK xmedcon multiframe1Integris.dcm.XDCM; #breaks No images found xmedcon multiframe1Integris.dcm; -gdcmTests testWrite multiframe2GE.dcm x; +gdcmCxxTests testWrite multiframe2GE.dcm x; vtkgdcmViewer multiframe2GE.dcm.XDCM; #OK #breaks xmedcon xmedcon multiframe2GE.dcm.XDCM; #breaks No images found vtkgdcmViewer irmPhlipsNew1.dcm; -gdcmTests testWrite irmPhlipsNew1.dcm x; # == gdcm-MR-PHILIPS-16.dcm +gdcmCxxTests testWrite irmPhlipsNew1.dcm x; # == gdcm-MR-PHILIPS-16.dcm vtkgdcmViewer irmPhlipsNew1.dcm.XDCM; #OK xmedcon irmPhlipsNew1.dcm.XDCM; #breaks : No images found #avec imagette (icone) vtkgdcmViewer icone.dcm; #OK -gdcmTests gdcmTests PrintHeader icone.dcm 2 | grep fffe; +gdcmCxxTests PrintHeader icone.dcm 2 | grep fffe; echo "so many 0xfffe ! (274)" -gdcmTests testWrite icone.dcm x; +gdcmCxxTests testWrite icone.dcm x; xmedcon icone.dcm; #original image OK -gdcmTests gdcmTests PrintHeader icone.dcm.XDCM 2; -#gdcmTests gdcmTests PrintHeader OK; vtkgdcmViewer OK; breaks xmedcom +gdcmCxxTests PrintHeader icone.dcm.XDCM 2; +#gdcmCxxTests PrintHeader OK; vtkgdcmViewer OK; breaks xmedcom vtkgdcmViewer icone.dcm.XDCM; # shitty image --> TODO : FIX (once again)icon pb xmedcon icone.dcm.XDCM; #breaks @@ -216,51 +215,51 @@ xmedcon icone.dcm.XDCM; #breaks #Explicit VR - Little Endian #---------------------------- -gdcmTests testWrite CT-MONO2-16-brain.dcm x; +gdcmCxxTests testWrite CT-MONO2-16-brain.dcm x; vtkgdcmViewer CT-MONO2-16-brain.dcm.XDCM; #OK xmedcon CT-MONO2-16-brain.dcm.XDCM; #OK -gdcmTests gdcmTests PrintHeader gdcm-MR-PHILIPS-16-Multi-Seq.dcm 2; +gdcmCxxTests PrintHeader gdcm-MR-PHILIPS-16-Multi-Seq.dcm 2; xmedcon gdcm-MR-PHILIPS-16-Multi-Seq.dcm #OK :Skip PHILIPS premature item bug vtkgdcmViewer gdcm-MR-PHILIPS-16-Multi-Seq.dcm; #OK -gdcmTests testWrite gdcm-MR-PHILIPS-16-Multi-Seq.dcm x; -gdcmTests gdcmTests PrintHeader gdcm-MR-PHILIPS-16-Multi-Seq.dcm.XDCM 2; #pixel group missing??!? +gdcmCxxTests testWrite gdcm-MR-PHILIPS-16-Multi-Seq.dcm x; +gdcmCxxTests PrintHeader gdcm-MR-PHILIPS-16-Multi-Seq.dcm.XDCM 2; #pixel group missing??!? #vtkgdcmViewer gdcm-MR-PHILIPS-16-Multi-Seq.dcm.XDCM; #shitty image, ofcourse xmedcon gdcm-MR-PHILIPS-16-Multi-Seq.dcm.XDCM; # works ?!? vtkgdcmViewer gdcm-MR-PHILIPS-16-Multi-Seq.dcm.XDCM; -gdcmTests testWrite gdcm-MR-PHILIPS-16-NonRectPix.dcm x; +gdcmCxxTests testWrite gdcm-MR-PHILIPS-16-NonRectPix.dcm x; vtkgdcmViewer gdcm-MR-PHILIPS-16-NonRectPix.dcm.XDCM; #OK xmedcon gdcm-MR-PHILIPS-16-NonRectPix.dcm.XDCM; #OK warning: Incorrect sequence length -gdcmTests testWrite MR-MONO2-8-16x-heart.dcm x; #multiframe # equals to ??? +gdcmCxxTests testWrite MR-MONO2-8-16x-heart.dcm x; #multiframe # equals to ??? vtkgdcmViewer MR-MONO2-8-16x-heart.dcm.XDCM; #OK xmedcon MR-MONO2-8-16x-heart.dcm.XDCM; #OK -gdcmTests testWrite NM-MONO2-16-13x-heart.dcm x; #multiframe +gdcmCxxTests testWrite NM-MONO2-16-13x-heart.dcm x; #multiframe vtkgdcmViewer NM-MONO2-16-13x-heart.dcm.XDCM; #OK xmedcon NM-MONO2-16-13x-heart.dcm.XDCM; #OK -gdcmTests testWrite sonataMonaco.dcm x; +gdcmCxxTests testWrite sonataMonaco.dcm x; vtkgdcmViewer sonataMonaco.dcm.XDCM; #OK xmedcon sonataMonaco.dcm.XDCM; #OK #MultiFrame -gdcmTests testWrite US-MONO2-8-8x-execho.dcm x; -gdcmTests gdcmTests PrintHeader US-MONO2-8-8x-execho.dcm.XDCM; +gdcmCxxTests testWrite US-MONO2-8-8x-execho.dcm x; +gdcmCxxTests PrintHeader US-MONO2-8-8x-execho.dcm.XDCM; vtkgdcmViewer US-MONO2-8-8x-execho.dcm.XDCM; # OK xmedcon US-MONO2-8-8x-execho.dcm.XDCM; #OK #RGB -gdcmTests testWrite US-RGB-8-epicard.dcm x; +gdcmCxxTests testWrite US-RGB-8-epicard.dcm x; echo "expected pixelType=8U SamplesPerPixel=3 PlanarConfiguration=1"; echo " PhotometricInterpretation=RGB"; vtkgdcmViewer US-RGB-8-epicard.dcm.XDCM; #OK xmedcon US-RGB-8-epicard.dcm.XDCM; #OK -gdcmTests testWrite US-RGB-8-esopecho.dcm x; +gdcmCxxTests testWrite US-RGB-8-esopecho.dcm x; echo "expected pixelType=8U SamplesPerPixel=3 PlanarConfiguration=0"; echo " PhotometricInterpretation=RGB", xmedcon US-RGB-8-esopecho.dcm.XDCM; #OK @@ -269,36 +268,36 @@ xmedcon US-RGB-8-esopecho.dcm.XDCM; #OK #-------------------------------------------------------------------------- # (JPEG Lossless) -gdcmTests testWrite CT-MONO2-16-chest.dcm x; +gdcmCxxTests testWrite CT-MONO2-16-chest.dcm x; vtkgdcmViewer CT-MONO2-16-chest.dcm.XDCM; #OK xmedcon CT-MONO2-16-chest.dcm.XDCM; #OK -gdcmTests testWrite 012345.002.050.dcm x; +gdcmCxxTests testWrite 012345.002.050.dcm x; vtkgdcmViewer 012345.002.050.dcm.XDCM; #OK xmedcon 012345.002.050.dcm.XDCM; #OK -gdcmTests testWrite gdcm-JPEG-LossLess3a.dcm x; +gdcmCxxTests testWrite gdcm-JPEG-LossLess3a.dcm x; vtkgdcmViewer gdcm-JPEG-LossLess3a.dcm.XDCM ; #OK xmedcon gdcm-JPEG-LossLess3a.dcm.XDCM; #OK -gdcmTests testWrite XA-MONO2-8-12x-catheter.dcm x; +gdcmCxxTests testWrite XA-MONO2-8-12x-catheter.dcm x; vtkgdcmViewer XA-MONO2-8-12x-catheter.dcm.XDCM; #OK -gdcmTests gdcmTests PrintHeader XA-MONO2-8-12x-catheter.dcm.XDCM 2; +gdcmCxxTests PrintHeader XA-MONO2-8-12x-catheter.dcm.XDCM 2; xmedcon XA-MONO2-8-12x-catheter.dcm.XDCM; #OK -gdcmTests testWrite xa_integris.dcm x; +gdcmCxxTests testWrite xa_integris.dcm x; echo "a lot of fragments expected here"; vtkgdcmViewer xa_integris.dcm.XDCM #OK xmedcon xa_integris.dcm.XDCM #OK -gdcmTests testWrite 16BitsJpegLosslessGrayScale.dcm x; +gdcmCxxTests testWrite 16BitsJpegLosslessGrayScale.dcm x; vtkgdcmViewer 16BitsJpegLosslessGrayScale.dcm.XDCM #OK xmedcon 16BitsJpegLosslessGrayScale.dcm.XDCM #OK #comming from GE dlx via VTServer vtkgdcmViewer I9000001.dcm; -gdcmTests testWrite I9000001.dcm x; -gdcmTests gdcmTests PrintHeader I9000001.dcm.XDCM 2; # pixel group NOT FOUND ??!?? +gdcmCxxTests testWrite I9000001.dcm x; +gdcmCxxTests PrintHeader I9000001.dcm.XDCM 2; # pixel group NOT FOUND ??!?? #black image vtkgdcmViewer I9000001.dcm.XDCM; #no image found @@ -306,30 +305,30 @@ xmedcon I9000001.dcm.XDCM; #JPEG Extended (Process 2 & 4) // 16 bits #----------------------------- -gdcmTests testWrite gdcm-JPEG-Extended.dcm x; +gdcmCxxTests testWrite gdcm-JPEG-Extended.dcm x; vtkgdcmViewer gdcm-JPEG-Extended.dcm.XDCM; #OK xmedcon gdcm-JPEG-Extended.dcm.XDCM; #OK -gdcmTests testWrite jpeglossy1.dcm x; +gdcmCxxTests testWrite jpeglossy1.dcm x; vtkgdcmViewer jpeglossy1.dcm.XDCM #OK xmedcon jpeglossy1.dcm.XDCM #OK #JPEG Baseline (Process 14) #-------------------------- -gdcmTests testWrite MR-MONO2-12-shoulder.dcm x; +gdcmCxxTests testWrite MR-MONO2-12-shoulder.dcm x; vtkgdcmViewer MR-MONO2-12-shoulder.dcm.XDCM; #OK xmedcon MR-MONO2-12-shoulder.dcm.XDCM; #OK #fichier format ecat. -#gdcmTests testWrite imageEcat.ecat r +#gdcmCxxTests testWrite imageEcat.ecat r #JPEG Lossy 8 bits #================= #JPEG Baseline (Process 1) #------------------------- # Bracco Files -gdcmTests testWrite US.1.2.dcm x; +gdcmCxxTests testWrite US.1.2.dcm x; echo "expected : A lot of Fragments (40), nb Frames = 40 ;-)"; echo "expected pixelType=8U SamplesPerPixel=3 PlanarConfiguration=0"; echo " PhotometricInterpretation=YBR_FULL_422"; @@ -337,24 +336,24 @@ vtkgdcmViewer US.1.2.dcm.XDCM; #OK xmedcon US.1.2.dcm.XDCM; #OK #Sequoia Acusson U11 -gdcmTests testWrite CLIP0001-Sequoia-U11.dcm x; +gdcmCxxTests testWrite CLIP0001-Sequoia-U11.dcm x; vtkgdcmViewer CLIP0001-Sequoia-U11.dcm.XDCM; #OK xmedcon CLIP0001-Sequoia-U11.dcm.XDCM; #OK #RLE Lossless #------------- -gdcmTests testWrite canadaAloka.dcm x; +gdcmCxxTests testWrite canadaAloka.dcm x; echo "expected pixelType=8U SamplesPerPixel=1"; echo " PlanarConfiguration=0 PhotometricInterpretation=MONOCHROME2"; echo " nb Frames (DIMZ) : 1"; vtkgdcmViewer canadaAloka.dcm.XDCM; # OK xmedcon canadaAloka.dcm.XDCM; #OK -gdcmTests testWrite jpeglossy1.dcm x; # equal to ??? +gdcmCxxTests testWrite jpeglossy1.dcm x; # equal to ??? vtkgdcmViewer jpeglossy1.dcm.XDCM; #OK xmedcon jpeglossy1.dcm.XDCM; #OK -gdcmTests testWrite FMAG0001.dcm x; +gdcmCxxTests testWrite FMAG0001.dcm x; echo "expected pixelType=8U SamplesPerPixel=3"; echo " PlanarConfiguration=1 PhotometricInterpretation=YBR_FULL"; echo " nb Frames (DIMZ) : 1"; @@ -364,13 +363,13 @@ xmedcon FMAG0001.dcm.XDCM; #OK vtkgdcmViewer QMAG0001.dcm; #OK xmedcon QMAG0001.dcm; #original breaks xmedcon #warning: Unknown PhotometricInterpretation -gdcmTests testWrite QMAG0001.dcm x; +gdcmCxxTests testWrite QMAG0001.dcm x; echo "expected pixelType=8U SamplesPerPixel=3"; echo " PlanarConfiguration=1 PhotometricInterpretation=YBR_FULL"; vtkgdcmViewer QMAG0001.dcm.XDCM; #OK xmedcon QMAG0001.dcm.XDCM; #OK -gdcmTests testWrite US-PAL-8-10x-echo.dcm x; +gdcmCxxTests testWrite US-PAL-8-10x-echo.dcm x; echo "expected pixelType=8U SamplesPerPixel=1 PlanarConfiguration=0"; echo " PhotometricInterpretation=PALETTE COLOR"; echo " nb Frames (DIMZ): 10"; @@ -379,12 +378,12 @@ echo " Reading 10 'single fragment' Segments (ouf!)"; vtkgdcmViewer US-PAL-8-10x-echo.dcm.XDCM; # SEG FAULT xmedcon US-PAL-8-10x-echo.dcm.XDCM; #OK -gdcmTests testWrite 8BitsRunLengthGrayScale.dcm x; +gdcmCxxTests testWrite 8BitsRunLengthGrayScale.dcm x; echo "expected : correct Gray image"; vtkgdcmViewer 8BitsRunLengthGrayScale.dcm.XDCM; #OK xmedcon 8BitsRunLengthGrayScale.dcm.XDCM; #OK -gdcmTests testWrite 8BitsRunLengthColor.dcm x; +gdcmCxxTests testWrite 8BitsRunLengthColor.dcm x; echo "expected pixelType=8U SamplesPerPixel=1 PlanarConfiguration=2"; echo " PhotometricInterpretation=PALETTE COLOR"; vtkgdcmViewer 8BitsRunLengthColor.dcm.XDCM; # SEG FAULT @@ -393,7 +392,7 @@ xmedcon 8BitsRunLengthColor.dcm.XDCM; #OK #RLE 16 bits --> Try to find some more images -gdcmTests testWrite 16BitsRunLengthGrayScale.dcm x; +gdcmCxxTests testWrite 16BitsRunLengthGrayScale.dcm x; echo "expected pixelType=16U SamplesPerPixel=1 PlanarConfiguration=0"; echo " PhotometricInterpretation=MONOCHROME2"; vtkgdcmViewer 16BitsRunLengthGrayScale.dcm.XDCM; @@ -403,12 +402,12 @@ xmedcon 16BitsRunLengthGrayScale.dcm.XDCM; #OK #-------------------------- #(break xmedcon) xmedcon 00191113.dcm; #No images found -gdcmTests testWrite 00191113.dcm x; +gdcmCxxTests testWrite 00191113.dcm x; vtkgdcmViewer 00191113.dcm.XDCM; #OK xmedcon 00191113.dcm.XDCM; #OK xmedcon DermaColorLossLess.dcm; #breaks xmedcon : No images found -gdcmTests testWrite DermaColorLossLess.dcm x; +gdcmCxxTests testWrite DermaColorLossLess.dcm x; xmedcon DermaColorLossLess.dcm.XDCM; #breaks xmedcon #Feb 02 19:33:16 log[2619]: warning: Tag with uneven length #Feb 02 19:33:16 log[2619]: warning: No transfer syntax found @@ -419,7 +418,7 @@ vtkgdcmViewer DermaColorLossLess.dcm.XDCM #OK affimdcm filein=RadBWLossLess.dcm; #OK vtkgdcmViewer RadBWLossLess.dcm; #OK xmedcon RadBWLossLess.dcm; # breaks :error: No images found -gdcmTests testWrite RadBWLossLess.dcm x; +gdcmCxxTests testWrite RadBWLossLess.dcm x; vtkgdcmViewer RadBWLossLess.dcm.XDCM; #OK xmedcon RadBWLossLess.dcm.XDCM; #error: No images found @@ -428,29 +427,29 @@ xmedcon RadBWLossLess.dcm.XDCM; #error: No images found #Rectangular old 24 Bits image vtkgdcmViewer gdcm-RGB-LibIDORect.acr; # OK -gdcmTests testWrite gdcm-RGB-LibIDORect.acr x; +gdcmCxxTests testWrite gdcm-RGB-LibIDORect.acr x; vtkgdcmViewer gdcm-RGB-LibIDORect.acr.XDCM; xmedcon gdcm-RGB-LibIDORect.acr.XDCM; # breaks : large Bit Allocated (24) #TODO transform '24 bit images' into 8 bits + samples per pixel = 3 #MR GE GENESIS_SIGNA Palo Alto -gdcmTests testWrite DicomSampleNastyGEImage.dcm x; +gdcmCxxTests testWrite DicomSampleNastyGEImage.dcm x; echo " expected : warning uneven length (13) for 0008|103e"; vtkgdcmViewer DicomSampleNastyGEImage.dcm.XDCM; #OK xmedcon DicomSampleNastyGEImage.dcm.XDCM; #OK #MR Philips NTSCAN Hop. Neuro Lyon -gdcmTests gdcmTests PrintHeader philipsMR-lossy.ima #OK +gdcmCxxTests PrintHeader philipsMR-lossy.ima #OK xmedcon philipsMR-lossy.ima; #original breaks xmedcon vtkgdcmViewer philipsMR-lossy.ima; #Original OK -gdcmTests testWrite philipsMR-lossy.ima x; +gdcmCxxTests testWrite philipsMR-lossy.ima x; echo "WAS expected : 'Bogus Huffman table definition' on philipsMR-lossy.ima"; echo "IS expected : 'JERR_BAD_HUFF_TABLE sym 16 (>15)' but the show goes on"; vtkgdcmViewer philipsMR-lossy.ima.XDCM; # BLACK IMAGE xmedcon philipsMR-lossy.ima.XDCM; #OK #CT Siemens Hop. Salengro Lille -gdcmTests testWrite gdcm-JPEG-LossLess3a.dcm x; +gdcmCxxTests testWrite gdcm-JPEG-LossLess3a.dcm x; echo "expected : wrong sequence delimiter (b00c,0eb6) at end of pixels"; echo "xmedcon says 'error: Unexpected end of file'"; vtkgdcmViewer gdcm-JPEG-LossLess3a.dcm.XDCM; #OK; needs 'R' for display @@ -459,7 +458,7 @@ xmedcon gdcm-JPEG-LossLess3a.dcm.XDCM; #OK #CR Philips Thoravision Hop Cardio Lyon affimdcm filein=gdcm-JPEG-LossLessThoravision.dcm; # OK, wrong image as usual xmedcon gdcm-JPEG-LossLessThoravision.dcm; #original seg faults xmedcon -gdcmTests testWrite gdcm-JPEG-LossLessThoravision.dcm x; #breaks ; +gdcmCxxTests testWrite gdcm-JPEG-LossLessThoravision.dcm x; #breaks ; echo "expected : 147 fragments,length : 29860 + 145*32760 + 14416"; echo "breaks xmedcom, breaks e-film"; echo "WAS expected : hashed image -with jLBJpeg-"; @@ -467,7 +466,7 @@ echo "IS expected : Seg Fault"; xmedcon gdcm-JPEG-LossLessThoravision.dcm.XDCM; # NOT CHECKED #MR Picker ST. ANTHONY HOSPITAL -gdcmTests testWrite MR.6799.1.dcm x; #equal to ??? +gdcmCxxTests testWrite MR.6799.1.dcm x; #equal to ??? echo "OK; DICOM Image with NO Preamble"; vtkgdcmViewer MR.6799.1.dcm.XDCM; #OK xmedcon MR.6799.1.dcm.XDCM; #OK @@ -475,7 +474,7 @@ xmedcon MR.6799.1.dcm.XDCM; #OK #Segmented Palette Color LUT Data xmedcon gdcm-US-ALOKA-16.dcm; #breaks # Missing CLUT vtkgdcmViewer gdcm-US-ALOKA-16.dcm3; #OK -gdcmTests testWrite gdcm-US-ALOKA-16.dcm x; +gdcmCxxTests testWrite gdcm-US-ALOKA-16.dcm x; echo "expected pixelType=16U SamplesPerPixel=1 PlanarConfiguration=0"; echo " PhotometricInterpretation=PALETTE COLOR"; echo "expected : Gray image since 'Segmented xxx Palette Color LUT Data' not yet taken into account"; @@ -488,20 +487,20 @@ xmedcon gdcm-US-ALOKA-16.dcm.XDCM; #breaks #Feb 03 13:40:19 log[26999]: error: No images found # bugged Siemens 'Leonardo' image -gdcmTests testWrite 8078283Leonardo.dcm x; +gdcmCxxTests testWrite 8078283Leonardo.dcm x; xmedcon 8078283Leonardo.dcm.XDCM; #OK #CT McTwin Elscint C.H.R.U LILLE C.HURIEZ xmedcon MxTwinLossLess.dcm; #breaks No images found vtkgdcmViewer MxTwinLossLess.dcm; #OK - gdcmTests testWrite MxTwinLossLess.dcm x; + gdcmCxxTests testWrite MxTwinLossLess.dcm x; vtkgdcmViewer MxTwinLossLess.dcm.XDCM; #OK xmedcon MxTwinLossLess.dcm.XDCM #breaks # MRI image from VPRO burned CD vtkgdcmViewer mriThruVPRO.dcm; # Tasteless SHIT xmedcon mriThruVPRO.dcm; # pas mieux -gdcmTests testWrite mriThruVPRO.dcm x; +gdcmCxxTests testWrite mriThruVPRO.dcm x; vtkgdcmViewer mriThruVPRO.dcm.XDCM; echo "expected : tasteless SHIT !" echo "breaks Siemens Leonardo viewer . JPEG encoding is bugged?" @@ -510,6 +509,6 @@ echo "breaks Siemens Leonardo viewer . JPEG encoding is bugged?" # due to H table, a SeQuence is tagged with 0 length # when using gdcmFile::WriteDcmXXX xmedcon fromTheralys.dcm; # Original breaks xmedcon -gdcmTests testWrite fromTheralys.dcm x; +gdcmCxxTests testWrite fromTheralys.dcm x; vtkgdcmViewer fromTheralys.dcm.XDCM; # OK xmedcon fromTheralys.dcm.XDCM; # OK diff --git a/checkWriteImplicit.sh b/checkWriteImplicit.sh index 4ca29d8..e67456d 100644 --- a/checkWriteImplicit.sh +++ b/checkWriteImplicit.sh @@ -11,150 +11,150 @@ #No Swap Info #------------ -testWrite mr176621.dcm d; +gdcmCxxTests testWrite mr176621.dcm d; #gdcmParser::CheckSwap: ACR/NEMA unfound swap info (time to raise bets) -PrintHeader mr176621.dcm.DCM 2; . -v mr176621.dcm.DCM; #OK +gdcmCxxTests gdcmCxxTests PrintHeader mr176621.dcm.DCM 2; . +vtkgdcmViewer mr176621.dcm.DCM; #OK xmedcon mr176621.dcm.DCM; #OK # No Transfert Syntax #-------------------- #Big Endian -testWrite cr172241.dcm r; # Big Soucy !! +gdcmCxxTests testWrite cr172241.dcm r; # Big Soucy !! affim filein=cr172241.dcm.RAW nbit=16 DIMX=1792 DIMY=2392; #OK -PrintHeader cr172241.dcm 2; #OK -v cr172241.dcm; # breaks (white image) WHITE IMAGE ?!? +gdcmCxxTests gdcmCxxTests PrintHeader cr172241.dcm 2; #OK +vtkgdcmViewer cr172241.dcm; # breaks (white image) WHITE IMAGE ?!? xmedcon cr172241.dcm; # OK #-- -testWrite cr172241.dcm d; -PrintHeader cr172241.dcm.DCM 2; #OK -v cr172241.dcm.DCM; # breaks ?!? +gdcmCxxTests testWrite cr172241.dcm d; +gdcmCxxTests PrintHeader cr172241.dcm.DCM 2; #OK +vtkgdcmViewer cr172241.dcm.DCM; # breaks ?!? xmedcon cr172241.dcm.DCM; # OK -testWrite cr_45031.dcm d; -v cr_45031.dcm.DCM; #OK +gdcmCxxTests testWrite cr_45031.dcm d; +vtkgdcmViewer cr_45031.dcm.DCM; #OK xmedcon cr_45031.dcm.DCM; #OK -testWrite CR-MONO1-10-chest.dcm d; -PrintHeader CR-MONO1-10-chest.dcm.DCM 2; #OK +gdcmCxxTests testWrite CR-MONO1-10-chest.dcm d; +gdcmCxxTests PrintHeader CR-MONO1-10-chest.dcm.DCM 2; #OK xmedcon CR-MONO1-10-chest.dcm.DCM; #OK -testWrite CT-MONO2-12-lomb-an2.acr2 d; -PrintHeader CT-MONO2-12-lomb-an2.acr2.DCM 2; # OK -v CT-MONO2-12-lomb-an2.acr2.DCM; #OK +gdcmCxxTests testWrite CT-MONO2-12-lomb-an2.acr2 d; +gdcmCxxTests PrintHeader CT-MONO2-12-lomb-an2.acr2.DCM 2; # OK +vtkgdcmViewer CT-MONO2-12-lomb-an2.acr2.DCM; #OK xmedcon CT-MONO2-12-lomb-an2.acr2.DCM; #OK -PrintHeader gdcm-MR-SIEMENS-16.acr1; #OK -testWrite gdcm-MR-SIEMENS-16.acr1 d; -PrintHeader gdcm-MR-SIEMENS-16.acr1.DCM 2 ; -v gdcm-MR-SIEMENS-16.acr1.DCM; +gdcmCxxTests PrintHeader gdcm-MR-SIEMENS-16.acr1; #OK +gdcmCxxTests testWrite gdcm-MR-SIEMENS-16.acr1 d; +gdcmCxxTests PrintHeader gdcm-MR-SIEMENS-16.acr1.DCM 2 ; +vtkgdcmViewer gdcm-MR-SIEMENS-16.acr1.DCM; xmedcon gdcm-MR-SIEMENS-16.acr1.DCM; #breaks error: No images found xmedcon gdcm-MR-SIEMENS-16.acr1; # OK -testWrite gdcm-MR-SIEMENS-16.acr2 d; -PrintHeader gdcm-MR-SIEMENS-16.acr2.DCM 2; -v gdcm-MR-SIEMENS-16.acr2.DCM; #OK +gdcmCxxTests testWrite gdcm-MR-SIEMENS-16.acr2 d; +gdcmCxxTests PrintHeader gdcm-MR-SIEMENS-16.acr2.DCM 2; +vtkgdcmViewer gdcm-MR-SIEMENS-16.acr2.DCM; #OK xmedcon gdcm-MR-SIEMENS-16.acr2.DCM; #breaks #Feb 03 18:50:24 log[4419]: warning: No transfer syntax found #Feb 03 18:50:24 log[4419]: warning: Tag with uneven length #Feb 03 18:50:24 log[4419]: error: No images found -testWrite MR-MONO2-12-an2.acr2 d; -PrintHeader newACR1000.nema.DCM 2; +gdcmCxxTests testWrite MR-MONO2-12-an2.acr2 d; +gdcmCxxTests PrintHeader newACR1000.nema.DCM 2; xmedcon MR-MONO2-12-an2.acr2.DCM; # NOT CHECKED -testWrite newACR1000.nema d; # == gdcmMR-SIEMENS-16.acr2 -PrintHeader newACR1000.nema.DCM; #OK -v newACR1000.nema.DCM; #OK +gdcmCxxTests testWrite newACR1000.nema d; # == gdcmMR-SIEMENS-16.acr2 +gdcmCxxTests PrintHeader newACR1000.nema.DCM; #OK +vtkgdcmViewer newACR1000.nema.DCM; #OK xmedcon newACR1000.nema.DCM; # breaks : no image found -testWrite oldACR00001.ima d; # == gdcm-MR-SIEMENS.16.acr1 -PrintHeader oldACR00001.ima.DCM; # OK -v oldACR00001.ima.DCM; #OK +gdcmCxxTests testWrite oldACR00001.ima d; # == gdcm-MR-SIEMENS.16.acr1 +gdcmCxxTests PrintHeader oldACR00001.ima.DCM; # OK +vtkgdcmViewer oldACR00001.ima.DCM; #OK xmedcon oldACR00001.ima.DCM; # breaks : no image found -testWrite OT-MONO2-8-a7.dcm d; +gdcmCxxTests testWrite OT-MONO2-8-a7.dcm d; xmedcon OT-MONO2-8-a7.dcm.DCM 2; #ok #No Samples Per Pixel #-------------------- -testWrite gdcm-CR-DCMTK-16-NonSamplePerPix.dcm d; +gdcmCxxTests testWrite gdcm-CR-DCMTK-16-NonSamplePerPix.dcm d; affim filein=gdcm-CR-DCMTK-16-NonSamplePerPix.dcm; -PrintHeader gdcm-CR-DCMTK-16-NonSamplePerPix.dcm.DCM 2; # OK +gdcmCxxTests PrintHeader gdcm-CR-DCMTK-16-NonSamplePerPix.dcm.DCM 2; # OK #Unnormalized Rectangular LibIDO format image #-------------------------------------------- -testWrite gdcm-ACR-LibIDO.acr d; -v gdcm-ACR-LibIDO.acr.DCM; +gdcmCxxTests testWrite gdcm-ACR-LibIDO.acr d; +vtkgdcmViewer gdcm-ACR-LibIDO.acr.DCM; xmedcon gdcm-ACR-LibIDO.acr.DCM; #Bits Allocated =12, Bits Stored=12 #---------------------------------- #MR Philips (once upon a time in Lyon-Sud) -testWrite MR-MONO2-12-angio-an1.acr1 d; -v MR-MONO2-12-angio-an1.acr1.DCM; # shitty image +gdcmCxxTests testWrite MR-MONO2-12-angio-an1.acr1 d; +vtkgdcmViewer MR-MONO2-12-angio-an1.acr1.DCM; # shitty image xmedcon R-MONO2-12-angio-an1.acr1.DCM;#pas mieux : warning: Incorrect PixelData length #RGB #--- -testWrite US.3405.1.dcm d; +gdcmCxxTests testWrite US.3405.1.dcm d; echo "expected pixelType=8U SamplesPerPixel=1 PlanarConfiguration=0"; echo " PhotometricInterpretation=RGB"; xmedcon US.3405.1.dcm.DCM; #OK -testWrite OT-PAL-8-face.dcm d; +gdcmCxxTests testWrite OT-PAL-8-face.dcm d; echo "expected pixelType=8U SamplesPerPixel=3 PlanarConfiguration=1"; echo " PhotometricInterpretation=PALETTE COLOR"; xmedcon OT-PAL-8-face.dcm.DCM; #OK -testWrite 8BitsUncompressedColor.dcm d; +gdcmCxxTests testWrite 8BitsUncompressedColor.dcm d; xmedcon 8BitsUncompressedColor.dcm.DCM ; #OK # Implicit VR - Little Endian #----------------------------- -testWrite CT-MONO2-16-ankle.dcm d; +gdcmCxxTests testWrite CT-MONO2-16-ankle.dcm d; xmedcon CT-MONO2-16-ankle.dcm.DCM; #ok - PrintHeader CT-MONO2-16-ankle.dcm 2; #ok + gdcmCxxTests PrintHeader CT-MONO2-16-ankle.dcm 2; #ok -testWrite CT-MONO2-16-ort.dcm d; +gdcmCxxTests testWrite CT-MONO2-16-ort.dcm d; xmedcon CT-MONO2-16-ort.dcm.DCM; #OK -PrintHeader CT-MONO2-16-ort.dcm.DCM 2; #ok +gdcmCxxTests PrintHeader CT-MONO2-16-ort.dcm.DCM 2; #ok -testWrite CT-MONO2-8-abdo.dcm d; +gdcmCxxTests testWrite CT-MONO2-8-abdo.dcm d; xmedcon CT-MONO2-8-abdo.dcm.DCM; #OK -testWrite gdcm-MR-PHILIPS-16.dcm d; -PrintHeader gdcm-MR-PHILIPS-16.dcm.DCM 2; #OK -v gdcm-MR-PHILIPS-16.dcm.DCM; # OK +gdcmCxxTests testWrite gdcm-MR-PHILIPS-16.dcm d; +gdcmCxxTests PrintHeader gdcm-MR-PHILIPS-16.dcm.DCM 2; #OK +vtkgdcmViewer gdcm-MR-PHILIPS-16.dcm.DCM; # OK xmedcom gdcm-MR-PHILIPS-16.dcm.DCM; # error: No images found xmedcom gdcm-MR-PHILIPS-16.dcm; # OK with original image -testWrite MR-MONO2-16-head.dcm d; +gdcmCxxTests testWrite MR-MONO2-16-head.dcm d; xmedcon MR-MONO2-16-head.dcm.DCM; #OK -testWrite multiframe1Integris.dcm d; -PrintHeader CT-MONO2-8-abdo.dcm.DCM 2; #OK -v multiframe1Integris.dcm.DCM; #OK +gdcmCxxTests testWrite multiframe1Integris.dcm d; +gdcmCxxTests PrintHeader CT-MONO2-8-abdo.dcm.DCM 2; #OK +vtkgdcmViewer multiframe1Integris.dcm.DCM; #OK xmedcon multiframe1Integris.dcm.DCM; #breaks No images found -testWrite multiframe2GE.dcm d; -v multiframe2GE.dcm.DCM; #OK +gdcmCxxTests testWrite multiframe2GE.dcm d; +vtkgdcmViewer multiframe2GE.dcm.DCM; #OK #breaks xmedcon xmedcon multiframe2GE.dcm.DCM; #breaks No images found -v irmPhlipsNew1.dcm; -testWrite irmPhlipsNew1.dcm d; # == gdcm-MR-PHILIPS-16.dcm -v irmPhlipsNew1.dcm.DCM; # black image +vtkgdcmViewer irmPhlipsNew1.dcm; +gdcmCxxTests testWrite irmPhlipsNew1.dcm d; # == gdcm-MR-PHILIPS-16.dcm +vtkgdcmViewer irmPhlipsNew1.dcm.DCM; # black image xmedcon irmPhlipsNew1.dcm.DCM; #breaks #avec imagette (icone) -testWrite icone.dcm d; -PrintHeader icone.dcm.DCM 2; -#PrintHeader OK; v OK; breaks xmedcom -v icone.dcm.DCM; +gdcmCxxTests testWrite icone.dcm d; +gdcmCxxTests PrintHeader icone.dcm.DCM 2; +#gdcmCxxTests PrintHeader OK; vtkgdcmViewer OK; breaks xmedcom +vtkgdcmViewer icone.dcm.DCM; xmedcon icone.dcm.DCM; #breaks #Palette @@ -165,44 +165,44 @@ xmedcon icone.dcm.DCM; #breaks #Explicit VR - Little Endian #---------------------------- -testWrite CT-MONO2-16-brain.dcm d; +gdcmCxxTests testWrite CT-MONO2-16-brain.dcm d; xmedcon CT-MONO2-16-brain.dcm.DCM; #OK -PrintHeader gdcm-MR-PHILIPS-16-Multi-Seq.dcm 2; +gdcmCxxTests PrintHeader gdcm-MR-PHILIPS-16-Multi-Seq.dcm 2; xmedcon gdcm-MR-PHILIPS-16-Multi-Seq.dcm #OK :Skip PHILIPS premature item bug -v gdcm-MR-PHILIPS-16-Multi-Seq.dcm; #OK -testWrite gdcm-MR-PHILIPS-16-Multi-Seq.dcm d; -PrintHeader gdcm-MR-PHILIPS-16-Multi-Seq.dcm.DCM 2; #pixel group missing ?!? -v gdcm-MR-PHILIPS-16-Multi-Seq.dcm.DCM; #NOT CHECKED +vtkgdcmViewer gdcm-MR-PHILIPS-16-Multi-Seq.dcm; #OK +gdcmCxxTests testWrite gdcm-MR-PHILIPS-16-Multi-Seq.dcm d; +gdcmCxxTests PrintHeader gdcm-MR-PHILIPS-16-Multi-Seq.dcm.DCM 2; #pixel group missing ?!? +vtkgdcmViewer gdcm-MR-PHILIPS-16-Multi-Seq.dcm.DCM; #NOT CHECKED xmedcon gdcm-MR-PHILIPS-16-Multi-Seq.dcm.DCM; #breaks -testWrite gdcm-MR-PHILIPS-16-NonRectPix.dcm d; -v gdcm-MR-PHILIPS-16-NonRectPix.dcm.DCM; #OK +gdcmCxxTests testWrite gdcm-MR-PHILIPS-16-NonRectPix.dcm d; +vtkgdcmViewer gdcm-MR-PHILIPS-16-NonRectPix.dcm.DCM; #OK xmedcon gdcm-MR-PHILIPS-16-NonRectPix.dcm.DCM; #OK -testWrite MR-MONO2-8-16x-heart.dcm d; #multiframe -v MR-MONO2-8-16x-heart.dcm.DCM; #OK +gdcmCxxTests testWrite MR-MONO2-8-16x-heart.dcm d; #multiframe +vtkgdcmViewer MR-MONO2-8-16x-heart.dcm.DCM; #OK xmedcon MR-MONO2-8-16x-heart.dcm.DCM; #OK -testWrite NM-MONO2-16-13x-heart.dcm d; #multiframe +gdcmCxxTests testWrite NM-MONO2-16-13x-heart.dcm d; #multiframe xmedcon NM-MONO2-16-13x-heart.dcm.DCM; #OK -testWrite sonataMonaco.dcm d; +gdcmCxxTests testWrite sonataMonaco.dcm d; xmedcon sonataMonaco.dcm.DCM; #OK #MultiFrame -testWrite US-MONO2-8-8x-execho.dcm d; -PrintHeader US-MONO2-8-8x-execho.dcm.DCM; +gdcmCxxTests testWrite US-MONO2-8-8x-execho.dcm d; +gdcmCxxTests PrintHeader US-MONO2-8-8x-execho.dcm.DCM; xmedcon US-MONO2-8-8x-execho.dcm.DCM; #OK #RGB -testWrite US-RGB-8-epicard.dcm d; +gdcmCxxTests testWrite US-RGB-8-epicard.dcm d; echo "expected pixelType=8U SamplesPerPixel=3 PlanarConfiguration=1"; echo " PhotometricInterpretation=RGB"; xmedcon US-RGB-8-epicard.dcm.DCM; #OK -testWrite US-RGB-8-esopecho.dcm d; +gdcmCxxTests testWrite US-RGB-8-esopecho.dcm d; echo "expected pixelType=8U SamplesPerPixel=3 PlanarConfiguration=0"; echo " PhotometricInterpretation=RGB", xmedcon US-RGB-8-esopecho.dcm.DCM; #OK @@ -211,94 +211,94 @@ xmedcon US-RGB-8-esopecho.dcm.DCM; #OK #-------------------------------------------------------------------------- # (JPEG Lossless) -testWrite CT-MONO2-16-chest.dcm d; +gdcmCxxTests testWrite CT-MONO2-16-chest.dcm d; xmedcon CT-MONO2-16-chest.dcm.DCM; #OK -testWrite 012345.002.050.dcm d; +gdcmCxxTests testWrite 012345.002.050.dcm d; xmedcon 012345.002.050.dcm.DCM; #OK -testWrite gdcm-JPEG-LossLess3a.dcm d; -PrintHeader gdcm-JPEG-LossLess3a.dcm.DCM 2; +gdcmCxxTests testWrite gdcm-JPEG-LossLess3a.dcm d; +gdcmCxxTests PrintHeader gdcm-JPEG-LossLess3a.dcm.DCM 2; xmedcon gdcm-JPEG-LossLess3a.dcm.DCM; #OK -testWrite XA-MONO2-8-12x-catheter.dcm d; -PrintHeader XA-MONO2-8-12x-catheter.dcm.DCM 2; +gdcmCxxTests testWrite XA-MONO2-8-12x-catheter.dcm d; +gdcmCxxTests PrintHeader XA-MONO2-8-12x-catheter.dcm.DCM 2; xmedcon XA-MONO2-8-12x-catheter.dcm.DCM; #OK -testWrite xa_integris.dcm d; +gdcmCxxTests testWrite xa_integris.dcm d; echo "a lot of fragments expected here"; xmedcon xa_integris.dcm.DCM #OK -testWrite 16BitsJpegLosslessGrayScale.dcm d; +gdcmCxxTests testWrite 16BitsJpegLosslessGrayScale.dcm d; xmedcon 16BitsJpegLosslessGrayScale.dcm.DCM #OK #comming from GE dlx via VTServer -v I9000001.dcm; -testWrite I9000001.dcm d; -PrintHeader I9000001.dcm.DCM 2; +vtkgdcmViewer I9000001.dcm; +gdcmCxxTests testWrite I9000001.dcm d; +gdcmCxxTests PrintHeader I9000001.dcm.DCM 2; #black image -v I9000001.dcm.DCM; +vtkgdcmViewer I9000001.dcm.DCM; #no image found xmedcon I9000001.dcm.DCM; #JPEG Extended (Process 2 & 4) // 16 bits #----------------------------- -testWrite gdcm-JPEG-Extended.dcm d; +gdcmCxxTests testWrite gdcm-JPEG-Extended.dcm d; xmedcon gdcm-JPEG-Extended.dcm.DCM; #OK -testWrite jpeglossy1.dcm d; +gdcmCxxTests testWrite jpeglossy1.dcm d; xmedcon jpeglossy1.dcm.DCM #OK #JPEG Baseline (Process 14) #-------------------------- -testWrite MR-MONO2-12-shoulder.dcm d; +gdcmCxxTests testWrite MR-MONO2-12-shoulder.dcm d; xmedcon MR-MONO2-12-shoulder.dcm.DCM; #OK #fichier format ecat. -#testWrite imageEcat.ecat r +#gdcmCxxTests testWrite imageEcat.ecat r #JPEG Lossy 8 bits #================= #JPEG Baseline (Process 1) #------------------------- # Bracco Files -testWrite US.1.2.dcm d; +gdcmCxxTests testWrite US.1.2.dcm d; echo "expected : A lot of Fragments (40), nb Frames = 40 ;-)"; echo "expected pixelType=8U SamplesPerPixel=3 PlanarConfiguration=0"; echo " PhotometricInterpretation=YBR_FULL_422"; xmedcon US.1.2.dcm.DCM; #OK #Sequoia Acusson U11 -testWrite CLIP0001-Sequoia-U11.dcm d; +gdcmCxxTests testWrite CLIP0001-Sequoia-U11.dcm d; xmedcon CLIP0001-Sequoia-U11.dcm.DCM; #OK #RLE Lossless #------------- -testWrite canadaAloka.dcm d; +gdcmCxxTests testWrite canadaAloka.dcm d; echo "expected pixelType=8U SamplesPerPixel=1"; echo " PlanarConfiguration=0 PhotometricInterpretation=MONOCHROME2"; echo " nb Frames (DIMZ) : 1"; xmedcon canadaAloka.dcm.DCM; -testWrite jpeglossy1.dcm d; +gdcmCxxTests testWrite jpeglossy1.dcm d; xmecon jpeglossy1.dcm.DCM; #OK -testWrite FMAG0001.dcm d; +gdcmCxxTests testWrite FMAG0001.dcm d; echo "expected pixelType=8U SamplesPerPixel=3"; echo " PlanarConfiguration=1 PhotometricInterpretation=YBR_FULL"; echo " nb Frames (DIMZ) : 1"; xmedcon FMAG0001.dcm.DCM; #OK -v QMAG0001.dcm; #OK +vtkgdcmViewer QMAG0001.dcm; #OK xmedcon QMAG0001.dcm; #original breaks xmedcon -testWrite QMAG0001.dcm d; +gdcmCxxTests testWrite QMAG0001.dcm d; echo "expected pixelType=8U SamplesPerPixel=3"; echo " PlanarConfiguration=1 PhotometricInterpretation=YBR_FULL"; -v QMAG0001.dcm.DCM; #OK +vtkgdcmViewer QMAG0001.dcm.DCM; #OK xmedcon QMAG0001.dcm.DCM; #OK -testWrite US-PAL-8-10x-echo.dcm d; +gdcmCxxTests testWrite US-PAL-8-10x-echo.dcm d; echo "expected pixelType=8U SamplesPerPixel=1 PlanarConfiguration=0"; echo " PhotometricInterpretation=PALETTE COLOR"; echo " nb Frames (DIMZ): 10"; @@ -306,11 +306,11 @@ echo "expected : Parsing 10 'single fragment' Segments"; echo " Reading 10 'single fragment' Segments (ouf!)"; xmedcon US-PAL-8-10x-echo.dcm.DCM; #OK -testWrite 8BitsRunLengthGrayScale.dcm d; +gdcmCxxTests testWrite 8BitsRunLengthGrayScale.dcm d; echo "expected : correct Gray image"; xmedcon 8BitsRunLengthGrayScale.dcm.DCM; #OK -testWrite 8BitsRunLengthColor.dcm d; +gdcmCxxTests testWrite 8BitsRunLengthColor.dcm d; echo "expected pixelType=8U SamplesPerPixel=1 PlanarConfiguration=2"; echo " PhotometricInterpretation=PALETTE COLOR"; echo "expected correct color image"; @@ -318,7 +318,7 @@ xmedcon 8BitsRunLengthColor.dcm.DCM; #OK #RLE 16 bits --> Try to find some more images -testWrite 16BitsRunLengthGrayScale.dcm d; +gdcmCxxTests testWrite 16BitsRunLengthGrayScale.dcm d; echo "expected pixelType=16U SamplesPerPixel=1 PlanarConfiguration=0"; echo " PhotometricInterpretation=MONOCHROME2"; xmedcon 16BitsRunLengthGrayScale.dcm.DCM; #OK @@ -327,51 +327,51 @@ xmedcon 16BitsRunLengthGrayScale.dcm.DCM; #OK #-------------------------- #(break xmedcon) xmedcon 00191113.dcm; #No images found -testWrite 00191113.dcm d; +gdcmCxxTests testWrite 00191113.dcm d; xmedcon 00191113.dcm.DCM; #OK xmedcon DermaColorLossLess.dcm; #breaks xmedcon : No images found -testWrite DermaColorLossLess.dcm d; +gdcmCxxTests testWrite DermaColorLossLess.dcm d; xmedcon DermaColorLossLess.dcm.DCM; #breaks xmedcon #Feb 02 19:33:16 log[2619]: warning: Tag with uneven length #Feb 02 19:33:16 log[2619]: warning: No transfer syntax found #Feb 02 19:33:16 log[2619]: error: No images found -v DermaColorLossLess.dcm.DCM #OK +vtkgdcmViewer DermaColorLossLess.dcm.DCM #OK #Original breaks xmedcon, affimdcm complian ?! affimdcm filein=RadBWLossLess.dcm; #OK -v RadBWLossLess.dcm; #OK +vtkgdcmViewer RadBWLossLess.dcm; #OK xmedcon RadBWLossLess.dcm; # breaks :error: No images found -testWrite RadBWLossLess.dcm d; -v RadBWLossLess.dcm.DCM; #OK +gdcmCxxTests testWrite RadBWLossLess.dcm d; +vtkgdcmViewer RadBWLossLess.dcm.DCM; #OK xmedcon RadBWLossLess.dcm.DCM; #error: No images found #Known as BUGGED ! #---------------- #Rectangular old 24 Bits image -testWrite gdcm-RGB-LibIDORect.acr d; -v gdcm-RGB-LibIDORect.acr.DCM; +gdcmCxxTests testWrite gdcm-RGB-LibIDORect.acr d; +vtkgdcmViewer gdcm-RGB-LibIDORect.acr.DCM; xmedcon gdcm-RGB-LibIDORect.acr.DCM; # breaks : large Bit Allocated (24) #TODO transform '24 bit images' into 8 bits + samples per pixel = 3 #MR GE GENESIS_SIGNA Palo Alto -testWrite DicomSampleNastyGEImage.dcm d; +gdcmCxxTests testWrite DicomSampleNastyGEImage.dcm d; echo " expected : warning uneven length (13) for 0008|103e"; xmedcon DicomSampleNastyGEImage.dcm.DCM; #OK #MR Philips NTSCAN Hop. Neuro Lyon -PrintHeader philipsMR-lossy.ima #OK +gdcmCxxTests PrintHeader philipsMR-lossy.ima #OK xmedcon philipsMR-lossy.ima; #original breaks xmedcon -v philipsMR-lossy.ima; #Original OK -testWrite philipsMR-lossy.ima d; +vtkgdcmViewer philipsMR-lossy.ima; #Original OK +gdcmCxxTests testWrite philipsMR-lossy.ima d; echo "WAS expected : 'Bogus Huffman table definition' on philipsMR-lossy.ima"; echo "IS expected : 'JERR_BAD_HUFF_TABLE sym 16 (>15)' but the show goes on"; -v philipsMR-lossy.ima.DCM; #OK +vtkgdcmViewer philipsMR-lossy.ima.DCM; #OK xmedcon philipsMR-lossy.ima.DCM; #OK #CT Siemens Hop. Salengro Lille -testWrite gdcm-JPEG-LossLess3a.dcm d; +gdcmCxxTests testWrite gdcm-JPEG-LossLess3a.dcm d; echo "expected : wrong sequence delimiter (b00c,0eb6) at end of pixels"; echo "xmedcon says 'error: Unexpected end of file'"; vtkgdcmViewer gdcm-JPEG-LossLess3a.dcm.DCM; #OK; needs 'R' for display @@ -380,7 +380,7 @@ xmedcon gdcm-JPEG-LossLess3a.dcm.DCM; #OK #CR Philips Thoravision Hop Cardio Lyon affimdcm filein=gdcm-JPEG-LossLessThoravision.dcm; # OK, wrong image as usual xmedcon gdcm-JPEG-LossLessThoravision.dcm; #original seg faults xmedcon -testWrite gdcm-JPEG-LossLessThoravision.dcm d; #breaks ; +gdcmCxxTests testWrite gdcm-JPEG-LossLessThoravision.dcm d; #breaks ; echo "expected : 147 fragments,length : 29860 + 145*32760 + 14416"; echo "breaks xmedcom, breaks e-film"; echo "WAS expected : hashed image -with jLBJpeg-"; @@ -388,14 +388,14 @@ echo "IS expected : Seg Fault"; xmedcon gdcm-JPEG-LossLessThoravision.dcm.DCM; # NOT CHECKED #MR Picker ST. ANTHONY HOSPITAL -testWrite MR.6799.1.dcm d; +gdcmCxxTests testWrite MR.6799.1.dcm d; echo "OK; DICOM Image with NO Preamble"; xmedcon MR.6799.1.dcm.DCM; #OK #Segmented Palette Color LUT Data xmedcon gdcm-US-ALOKA-16.dcm; #breaks vtkgdcmViewer gdcm-US-ALOKA-16.dcm3; #OK -testWrite gdcm-US-ALOKA-16.dcm d; +gdcmCxxTests testWrite gdcm-US-ALOKA-16.dcm d; echo "expected pixelType=16U SamplesPerPixel=1 PlanarConfiguration=0"; echo " PhotometricInterpretation=PALETTE COLOR"; echo "expected : Gray image since 'Segmented xxx Palette Color LUT Data' not yet taken into account"; @@ -408,21 +408,21 @@ xmedcon gdcm-US-ALOKA-16.dcm.DCM; #breaks #Feb 03 13:40:19 log[26999]: error: No images found # bugged Siemens 'Leonardo' image -testWrite 8078283Leonardo.dcm d; +gdcmCxxTests testWrite 8078283Leonardo.dcm d; xmedcon 8078283Leonardo.dcm.DCM; #OK #CT McTwin Elscint C.H.R.U LILLE C.HURIEZ xmedcon MxTwinLossLess.dcm; #breaks - v MxTwinLossLess.dcm; #OK - testWrite MxTwinLossLess.dcm d; - v MxTwinLossLess.dcm.DCM; #OK + vtkgdcmViewer MxTwinLossLess.dcm; #OK + gdcmCxxTests testWrite MxTwinLossLess.dcm d; + vtkgdcmViewer MxTwinLossLess.dcm.DCM; #OK xmedcon MxTwinLossLess.dcm.DCM #breaks # MRI image from VPRO burned CD -v mriThruVPRO.dcm; # Tasteless SHIT +vtkgdcmViewer mriThruVPRO.dcm; # Tasteless SHIT xmedcon mriThruVPRO.dcm; # pas mieux -testWrite mriThruVPRO.dcm d; -v mriThruVPRO.dcm.DCM; +gdcmCxxTests testWrite mriThruVPRO.dcm d; +vtkgdcmViewer mriThruVPRO.dcm.DCM; echo "expected : tasteless SHIT !" echo "breaks Siemens Leonardo viewer . JPEG encoding is bugged?" @@ -430,6 +430,6 @@ echo "breaks Siemens Leonardo viewer . JPEG encoding is bugged?" # due to H table, a SeQuence is tagged with 0 length # when using gdcmFile::WriteDcmXXX xmedcon fromTheralys.dcm; # Original breaks xmedcon -testWrite fromTheralys.dcm d; -v fromTheralys.dcm.DCM; # OK (unsolved Length = 13 ...) +gdcmCxxTests testWrite fromTheralys.dcm d; +vtkgdcmViewer fromTheralys.dcm.DCM; # OK (unsolved Length = 13 ...) xmedcon fromTheralys.dcm.DCM; # Breaks : no image found diff --git a/checkvtkgdcmViewer.sh b/checkvtkgdcmViewer.sh index a37f0ef..860c03a 100644 --- a/checkvtkgdcmViewer.sh +++ b/checkvtkgdcmViewer.sh @@ -69,6 +69,8 @@ vtkgdcmViewer US-RGB-8-esopecho.dcm vtkgdcmViewer xa_integris.dcm vtkgdcmViewer XA-MONO2-8-12x-catheter.dcm + + #xmedcom breakers #---------------- vtkgdcmViewer 00191113.dcm