Mercurial > hg > orthanc

comparison UnitTestsSources/ImageProcessingTests.cpp @ 2007:655489d9165d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
DicomMap::ParseDicomMetaInformation()
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 09 Jun 2016 15:46:33 +0200
parents 8b1baa2315b8
children a3a65de1840f
comparison
equal deleted inserted replaced
2006:6301bbcbcaed 2007:655489d9165d
42 42
43 TEST(DicomImageInformation, ExtractPixelFormat1) 43 TEST(DicomImageInformation, ExtractPixelFormat1)
44 { 44 {
45 // Cardiac/MR* 45 // Cardiac/MR*
46 DicomMap m; 46 DicomMap m;
47 m.SetValue(DICOM_TAG_ROWS, "24"); 47 m.SetValue(DICOM_TAG_ROWS, "24", false);
48 m.SetValue(DICOM_TAG_COLUMNS, "16"); 48 m.SetValue(DICOM_TAG_COLUMNS, "16", false);
49 m.SetValue(DICOM_TAG_BITS_ALLOCATED, "16"); 49 m.SetValue(DICOM_TAG_BITS_ALLOCATED, "16", false);
50 m.SetValue(DICOM_TAG_SAMPLES_PER_PIXEL, "1"); 50 m.SetValue(DICOM_TAG_SAMPLES_PER_PIXEL, "1", false);
51 m.SetValue(DICOM_TAG_BITS_STORED, "12"); 51 m.SetValue(DICOM_TAG_BITS_STORED, "12", false);
52 m.SetValue(DICOM_TAG_HIGH_BIT, "11"); 52 m.SetValue(DICOM_TAG_HIGH_BIT, "11", false);
53 m.SetValue(DICOM_TAG_PIXEL_REPRESENTATION, "0"); 53 m.SetValue(DICOM_TAG_PIXEL_REPRESENTATION, "0", false);
54 m.SetValue(DICOM_TAG_PHOTOMETRIC_INTERPRETATION, "MONOCHROME2"); 54 m.SetValue(DICOM_TAG_PHOTOMETRIC_INTERPRETATION, "MONOCHROME2", false);
55 55
56 DicomImageInformation info(m); 56 DicomImageInformation info(m);
57 PixelFormat format; 57 PixelFormat format;
58 ASSERT_TRUE(info.ExtractPixelFormat(format, false)); 58 ASSERT_TRUE(info.ExtractPixelFormat(format, false));
59 ASSERT_EQ(PixelFormat_Grayscale16, format); 59 ASSERT_EQ(PixelFormat_Grayscale16, format);
62 62
63 TEST(DicomImageInformation, ExtractPixelFormat2) 63 TEST(DicomImageInformation, ExtractPixelFormat2)
64 { 64 {
65 // Delphine CT 65 // Delphine CT
66 DicomMap m; 66 DicomMap m;
67 m.SetValue(DICOM_TAG_ROWS, "24"); 67 m.SetValue(DICOM_TAG_ROWS, "24", false);
68 m.SetValue(DICOM_TAG_COLUMNS, "16"); 68 m.SetValue(DICOM_TAG_COLUMNS, "16", false);
69 m.SetValue(DICOM_TAG_BITS_ALLOCATED, "16"); 69 m.SetValue(DICOM_TAG_BITS_ALLOCATED, "16", false);
70 m.SetValue(DICOM_TAG_SAMPLES_PER_PIXEL, "1"); 70 m.SetValue(DICOM_TAG_SAMPLES_PER_PIXEL, "1", false);
71 m.SetValue(DICOM_TAG_BITS_STORED, "16"); 71 m.SetValue(DICOM_TAG_BITS_STORED, "16", false);
72 m.SetValue(DICOM_TAG_HIGH_BIT, "15"); 72 m.SetValue(DICOM_TAG_HIGH_BIT, "15", false);
73 m.SetValue(DICOM_TAG_PIXEL_REPRESENTATION, "1"); 73 m.SetValue(DICOM_TAG_PIXEL_REPRESENTATION, "1", false);
74 m.SetValue(DICOM_TAG_PHOTOMETRIC_INTERPRETATION, "MONOCHROME2"); 74 m.SetValue(DICOM_TAG_PHOTOMETRIC_INTERPRETATION, "MONOCHROME2", false);
75 75
76 DicomImageInformation info(m); 76 DicomImageInformation info(m);
77 PixelFormat format; 77 PixelFormat format;
78 ASSERT_TRUE(info.ExtractPixelFormat(format, false)); 78 ASSERT_TRUE(info.ExtractPixelFormat(format, false));
79 ASSERT_EQ(PixelFormat_SignedGrayscale16, format); 79 ASSERT_EQ(PixelFormat_SignedGrayscale16, format);