orthanc: UnitTestsSources/FromDcmtkTests.cpp comparison

comparison UnitTestsSources/FromDcmtkTests.cpp @ 3883:795c9ca5eb91 transcoding

DANGEROUS changeset: replaced "getOriginalXfer()" by "getCurrentXfer()" throughout Orthanc

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Tue, 05 May 2020 14:11:47 +0200
parents	904575738462
children	83061cdc7703

comparison

equal deleted inserted replaced

-:904575738462
+:795c9ca5eb91
 throw OrthancException(ErrorCode_InternalError);
 }
 DcmDataset& dataset = *dicom.getDataset();
-E_TransferSyntax xfer = dataset.getOriginalXfer();
+E_TransferSyntax xfer = dataset.getCurrentXfer();
 if (xfer == EXS_Unknown)
 {
 dataset.updateOriginalXfer();
-xfer = dataset.getOriginalXfer();
+xfer = dataset.getCurrentXfer();
 if (xfer == EXS_Unknown)
 {
 throw OrthancException(ErrorCode_BadFileFormat,
 "Cannot determine the transfer syntax of the DICOM instance");
 }
 }
 DcmDataset& dataset = *dicom_->getDataset();
 index_.reset(new DicomFrameIndex(dataset));
-E_TransferSyntax xfer = dataset.getOriginalXfer();
+E_TransferSyntax xfer = dataset.getCurrentXfer();
 if (xfer == EXS_Unknown)
 {
 dataset.updateOriginalXfer();
-xfer = dataset.getOriginalXfer();
+xfer = dataset.getCurrentXfer();
 if (xfer == EXS_Unknown)
 {
 throw OrthancException(ErrorCode_BadFileFormat,
 "Cannot determine the transfer syntax of the DICOM instance");
 }
 public:
 virtual ~IDicomTranscoder()
 {
 }
+/**
+* Transcoding flavor that creates a new parsed DICOM file. A
+* "std::set<>" is used to give the possible plugin the
+* possibility to do a single parsing for all the possible
+* transfer syntaxes.
+**/
 virtual DcmFileFormat* Transcode(const void* buffer,
 size_t size,
 const std::set<DicomTransferSyntax>& allowedSyntaxes,
 bool allowNewSopInstanceUid) = 0;
-// In-place transcoding. This method can return "false" if not supported,
+/**
-// in which case the "Transcode()" method should be used.
+* In-place transcoding. This method is used first during
+* C-STORE. It can return "false" if inplace is not supported, in
+* which case the "Transcode()" method should be used.
+**/
 virtual bool InplaceTranscode(DcmFileFormat& dicom,
 const std::set<DicomTransferSyntax>& allowedSyntaxes,
 bool allowNewSopInstanceUid) = 0;
 /**
 else
 {
 transcoded.reset(transcoder.Transcode(buffer, size, uncompressedSyntaxes, false));
 }
-// The "dicom" variable must not be used below this point
+// WARNING: The "dicom" variable must not be used below this
+// point. The "sopInstanceUid" might also have changed (if
+// using lossy compression).
 if (transcoded == NULL ||
 transcoded->getDataset() == NULL)
 {
 throw OrthancException(
 connection.Store(sopClassUid, sopInstanceUid, *transcoded, moveOriginatorAET, moveOriginatorID);
 }
 }
 }
 }
+static void Store(std::string& sopClassUid /* out */,
+std::string& sopInstanceUid /* out */,
+DicomStoreUserConnection& connection,
+IDicomTranscoder& transcoder,
+const void* buffer,
+size_t size)
+{
+Store(sopClassUid, sopInstanceUid, connection, transcoder,
+buffer, size, "", 0 /* Not a C-MOVE */);
+}
 };
 class DcmtkTranscoder : public IDicomTranscoder
 {
 if (dicom.getDataset() == NULL)
 {
 throw OrthancException(ErrorCode_InternalError);
 }
+DicomTransferSyntax syntax;
+if (!FromDcmtkBridge::LookupOrthancTransferSyntax(syntax, dicom))
+{
+throw OrthancException(ErrorCode_BadFileFormat,
+"Cannot determine the transfer syntax");
+}
 const uint16_t bitsStored = GetBitsStored(*dicom.getDataset());
-#if 0
+if (allowedSyntaxes.find(syntax) != allowedSyntaxes.end())
-if (syntax == DetectTransferSyntax(*dicom))
 {
 // No transcoding is needed
-return new Image(dicom.release(), syntax);
+return true;
 }
-if (syntax == DicomTransferSyntax_LittleEndianImplicit &&
+if (allowedSyntaxes.find(DicomTransferSyntax_LittleEndianImplicit) != allowedSyntaxes.end() &&
-FromDcmtkBridge::Transcode(*dicom, DicomTransferSyntax_LittleEndianImplicit, NULL))
+FromDcmtkBridge::Transcode(dicom, DicomTransferSyntax_LittleEndianImplicit, NULL))
 {
-return new Image(dicom.release(), syntax);
+return true;
 }
-if (syntax == DicomTransferSyntax_LittleEndianExplicit &&
+if (allowedSyntaxes.find(DicomTransferSyntax_LittleEndianExplicit) != allowedSyntaxes.end() &&
-FromDcmtkBridge::Transcode(*dicom, DicomTransferSyntax_LittleEndianExplicit, NULL))
+FromDcmtkBridge::Transcode(dicom, DicomTransferSyntax_LittleEndianExplicit, NULL))
 {
-return new Image(dicom.release(), syntax);
+return true;
 }
-if (syntax == DicomTransferSyntax_BigEndianExplicit &&
+if (allowedSyntaxes.find(DicomTransferSyntax_BigEndianExplicit) != allowedSyntaxes.end() &&
-FromDcmtkBridge::Transcode(*dicom, DicomTransferSyntax_BigEndianExplicit, NULL))
+FromDcmtkBridge::Transcode(dicom, DicomTransferSyntax_BigEndianExplicit, NULL))
 {
-return new Image(dicom.release(), syntax);
+return true;
 }
-if (syntax == DicomTransferSyntax_DeflatedLittleEndianExplicit &&
+if (allowedSyntaxes.find(DicomTransferSyntax_DeflatedLittleEndianExplicit) != allowedSyntaxes.end() &&
-FromDcmtkBridge::Transcode(*dicom, DicomTransferSyntax_DeflatedLittleEndianExplicit, NULL))
+FromDcmtkBridge::Transcode(dicom, DicomTransferSyntax_DeflatedLittleEndianExplicit, NULL))
 {
-return new Image(dicom.release(), syntax);
+return true;
 }
 #if ORTHANC_ENABLE_JPEG == 1
-if (syntax == DicomTransferSyntax_JPEGProcess1 &&
+if (allowedSyntaxes.find(DicomTransferSyntax_JPEGProcess1) != allowedSyntaxes.end() &&
 allowNewSopInstanceUid &&
 bitsStored == 8)
 {
 DJ_RPLossy rpLossy(lossyQuality_);
-if (FromDcmtkBridge::Transcode(*dicom, DicomTransferSyntax_JPEGProcess1, &rpLossy))
+if (FromDcmtkBridge::Transcode(dicom, DicomTransferSyntax_JPEGProcess1, &rpLossy))
 {
-return new Image(dicom.release(), syntax);
+return true;
 }
 }
 #endif
 #if ORTHANC_ENABLE_JPEG == 1
-if (syntax == DicomTransferSyntax_JPEGProcess2_4 &&
+if (allowedSyntaxes.find(DicomTransferSyntax_JPEGProcess2_4) != allowedSyntaxes.end() &&
 allowNewSopInstanceUid &&
 bitsStored <= 12)
 {
 DJ_RPLossy rpLossy(lossyQuality_);
-if (FromDcmtkBridge::Transcode(*dicom, DicomTransferSyntax_JPEGProcess2_4, &rpLossy))
+if (FromDcmtkBridge::Transcode(dicom, DicomTransferSyntax_JPEGProcess2_4, &rpLossy))
 {
-return new Image(dicom.release(), syntax);
+return true;
 }
 }
 #endif
+return false;
+}
+};
+}
+TEST(Toto, DISABLED_Transcode3)
+{
+DicomAssociationParameters p;
+p.SetRemotePort(2000);
+DcmtkTranscoder transcoder;
+for (int i = 0; i <= DicomTransferSyntax_XML; i++)
+{
+DicomTransferSyntax a = (DicomTransferSyntax) i;
+std::string path = ("/home/jodogne/Subversion/orthanc-tests/Database/TransferSyntaxes/" +
+std::string(GetTransferSyntaxUid(a)) + ".dcm");
+if (Orthanc::SystemToolbox::IsRegularFile(path))
+{
+printf("\n======= %s\n", GetTransferSyntaxUid(a));
+std::string source;
+Orthanc::SystemToolbox::ReadFile(source, path);
+DicomStoreUserConnection scu(p);
+scu.SetCommonClassesProposed(false);
+scu.SetRetiredBigEndianProposed(true);
+std::string c, i;
+IDicomTranscoder::Store(c, i, scu, transcoder, source.c_str(), source.size());
+}
+}
+}
 #endif
-return false;
-}
-};
-}
-#endif

Mercurial > hg > orthanc

comparison UnitTestsSources/FromDcmtkTests.cpp @ 3883:795c9ca5eb91 transcoding