Mercurial > hg > orthanc

comparison UnitTestsSources/FromDcmtkTests.cpp @ 3766:711d2ec2db34 transcoding

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cont
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 17 Mar 2020 13:11:44 +0100
parents 4a25727401cd
children 66e18aad0654
comparison
equal deleted inserted replaced
3765:4a25727401cd 3766:711d2ec2db34
2130 FromDcmtkBridge::Transcode(target, *dicom_, DicomTransferSyntax_BigEndianExplicit, NULL)) 2130 FromDcmtkBridge::Transcode(target, *dicom_, DicomTransferSyntax_BigEndianExplicit, NULL))
2131 { 2131 {
2132 return true; 2132 return true;
2133 } 2133 }
2134 else if (syntaxes.find(DicomTransferSyntax_JPEGProcess1) != syntaxes.end() && 2134 else if (syntaxes.find(DicomTransferSyntax_JPEGProcess1) != syntaxes.end() &&
2135 allowNewSopInstanceUid &&
2135 FromDcmtkBridge::Transcode(target, *dicom_, DicomTransferSyntax_JPEGProcess1, &rpLossy)) 2136 FromDcmtkBridge::Transcode(target, *dicom_, DicomTransferSyntax_JPEGProcess1, &rpLossy))
2136 { 2137 {
2137 return true; 2138 return true;
2138 } 2139 }
2139 else 2140 else
2301 if (0) 2302 if (0)
2302 { 2303 {
2303 std::string s; 2304 std::string s;
2304 //SystemToolbox::ReadFile(s, "/home/jodogne/Subversion/orthanc-tests/Database/TransferSyntaxes/1.2.840.10008.1.2.4.50.dcm"); 2305 //SystemToolbox::ReadFile(s, "/home/jodogne/Subversion/orthanc-tests/Database/TransferSyntaxes/1.2.840.10008.1.2.4.50.dcm");
2305 //SystemToolbox::ReadFile(s, "/home/jodogne/DICOM/Alain.dcm"); 2306 //SystemToolbox::ReadFile(s, "/home/jodogne/DICOM/Alain.dcm");
2306 SystemToolbox::ReadFile(s, "/home/jodogne/Subversion/orthanc-tests/Database/Brainix/Epi/IM-0001-0002.dcm"); 2307 //SystemToolbox::ReadFile(s, "/home/jodogne/Subversion/orthanc-tests/Database/Brainix/Epi/IM-0001-0002.dcm");
2308 SystemToolbox::ReadFile(s, "/home/jodogne/Subversion/orthanc-tests/Database/TransferSyntaxes/1.2.840.10008.1.2.1.dcm");
2307 2309
2308 std::auto_ptr<DcmFileFormat> dicom(FromDcmtkBridge::LoadFromMemoryBuffer(s.c_str(), s.size())); 2310 std::auto_ptr<DcmFileFormat> dicom(FromDcmtkBridge::LoadFromMemoryBuffer(s.c_str(), s.size()));
2309 2311
2310 // less /home/jodogne/Downloads/dcmtk-3.6.4/dcmdata/include/dcmtk/dcmdata/dcxfer.h 2312 // less /home/jodogne/Downloads/dcmtk-3.6.4/dcmdata/include/dcmtk/dcmdata/dcxfer.h
2311 printf(">> %d\n", dicom->getDataset()->getOriginalXfer()); // => 4 == EXS_JPEGProcess1 2313 printf(">> %d\n", dicom->getDataset()->getOriginalXfer()); // => 4 == EXS_JPEGProcess1
2313 const DcmRepresentationParameter *p; 2315 const DcmRepresentationParameter *p;
2314 2316
2315 #if 0 2317 #if 0
2316 E_TransferSyntax target = EXS_LittleEndianExplicit; 2318 E_TransferSyntax target = EXS_LittleEndianExplicit;
2317 p = NULL; 2319 p = NULL;
2318 #elif 1 2320 #elif 0
2319 E_TransferSyntax target = EXS_JPEGProcess14SV1; 2321 E_TransferSyntax target = EXS_JPEGProcess14SV1;
2320 DJ_RPLossless rp_lossless(6, 0); 2322 DJ_RPLossless rp_lossless(6, 0);
2321 p = &rp_lossless; 2323 p = &rp_lossless;
2322 #else 2324 #else
2323 E_TransferSyntax target = EXS_JPEGProcess1; 2325 E_TransferSyntax target = EXS_JPEGProcess1;
2333 2335
2334 SystemToolbox::WriteFile(s, "source.dcm"); 2336 SystemToolbox::WriteFile(s, "source.dcm");
2335 SystemToolbox::WriteFile(t, "target.dcm"); 2337 SystemToolbox::WriteFile(t, "target.dcm");
2336 } 2338 }
2337 2339
2338 if (1) 2340 if (0)
2339 { 2341 {
2340 const char* const PATH = "/home/jodogne/Subversion/orthanc-tests/Database/TransferSyntaxes"; 2342 const char* const PATH = "/home/jodogne/Subversion/orthanc-tests/Database/TransferSyntaxes";
2341 2343
2342 for (boost::filesystem::directory_iterator it(PATH); 2344 for (boost::filesystem::directory_iterator it(PATH);
2343 it != boost::filesystem::directory_iterator(); ++it) 2345 it != boost::filesystem::directory_iterator(); ++it)
2353 { 2355 {
2354 TestFile("/home/jodogne/Subversion/orthanc-tests/Database/Multiframe.dcm"); 2356 TestFile("/home/jodogne/Subversion/orthanc-tests/Database/Multiframe.dcm");
2355 TestFile("/home/jodogne/Subversion/orthanc-tests/Database/Issue44/Monochrome1-Jpeg.dcm"); 2357 TestFile("/home/jodogne/Subversion/orthanc-tests/Database/Issue44/Monochrome1-Jpeg.dcm");
2356 } 2358 }
2357 2359
2358 if (0) 2360 if (1)
2359 { 2361 {
2360 TestFile("/home/jodogne/Subversion/orthanc-tests/Database/TransferSyntaxes/1.2.840.10008.1.2.1.dcm"); 2362 TestFile("/home/jodogne/Subversion/orthanc-tests/Database/TransferSyntaxes/1.2.840.10008.1.2.1.dcm");
2361 } 2363 }
2362 } 2364 }
2363 2365