orthanc: UnitTestsSources/FromDcmtkTests.cpp comparison

comparison UnitTestsSources/FromDcmtkTests.cpp @ 3889:56ce23ba93b7 transcoding

PluginDicomTranscoder

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Tue, 05 May 2020 17:46:28 +0200
parents	e46b7a997f0a
children	7a5fa8f307e9

comparison

equal deleted inserted replaced

-:e46b7a997f0a
+:56ce23ba93b7
 * 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,
+virtual DcmFileFormat* TranscodeToParsed(const void* buffer,
 size_t size,
 const std::set<DicomTransferSyntax>& allowedSyntaxes,
 bool allowNewSopInstanceUid) = 0;
+virtual bool HasInplaceTranscode() const = 0;
 /**
-* In-place transcoding. This method is used first during
+* In-place transcoding. This method is preferred for C-STORE.
-* 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;
 uncompressedSyntaxes.insert(DicomTransferSyntax_BigEndianExplicit);
 }
 std::unique_ptr<DcmFileFormat> transcoded;
-if (transcoder.InplaceTranscode(*dicom, uncompressedSyntaxes, false))
+if (transcoder.HasInplaceTranscode())
 {
-// In-place transcoding is supported
+if (transcoder.InplaceTranscode(*dicom, uncompressedSyntaxes, false))
-transcoded.reset(dicom.release());
+{
+// In-place transcoding is supported and has succeeded
+transcoded.reset(dicom.release());
+}
 }
 else
 {
-transcoded.reset(transcoder.Transcode(buffer, size, uncompressedSyntaxes, false));
+transcoded.reset(transcoder.TranscodeToParsed(buffer, size, uncompressedSyntaxes, false));
 }
 // WARNING: The "dicom" variable must not be used below this
 // point. The "sopInstanceUid" might also have changed (if
 // using lossy compression).
 unsigned int GetLossyQuality() const
 {
 return lossyQuality_;
 }
-virtual DcmFileFormat* Transcode(const void* buffer,
+virtual DcmFileFormat* TranscodeToParsed(const void* buffer,
 size_t size,
 const std::set<DicomTransferSyntax>& allowedSyntaxes,
 bool allowNewSopInstanceUid) ORTHANC_OVERRIDE
 {
 std::unique_ptr<DcmFileFormat> dicom(FromDcmtkBridge::LoadFromMemoryBuffer(buffer, size));
 if (dicom.get() == NULL)
 {
 }
 else
 {
 return NULL;
 }
+}
+virtual bool HasInplaceTranscode() const
+{
+return true;
 }
 virtual bool InplaceTranscode(DcmFileFormat& dicom,
 const std::set<DicomTransferSyntax>& allowedSyntaxes,
 bool allowNewSopInstanceUid) ORTHANC_OVERRIDE
 size_t size,
 const std::set<DicomTransferSyntax>& allowedSyntaxes,
 bool allowNewSopInstanceUid) ORTHANC_OVERRIDE
 {
 std::unique_ptr<DcmFileFormat> transcoded(
-Transcode(buffer, size, allowedSyntaxes, allowNewSopInstanceUid));
+TranscodeToParsed(buffer, size, allowedSyntaxes, allowNewSopInstanceUid));
 if (transcoded.get() == NULL)
 {
 return false;
 }
 FromDcmtkBridge::SaveToMemoryBuffer(target, *transcoded->getDataset());
 return true;
 }
 }
 };
+class PluginDicomTranscoder: public IDicomTranscoder
+{
+private:
+bool             tryDcmtk_;
+DcmtkTranscoder  dcmtk_;
+protected:
+virtual bool TranscodeInternal(std::string& target,
+const void* buffer,
+size_t size,
+const std::set<DicomTransferSyntax>& allowedSyntaxes,
+bool allowNewSopInstanceUid) = 0;
+public:
+PluginDicomTranscoder(bool tryDcmtk) :
+tryDcmtk_(tryDcmtk)
+{
+}
+virtual bool TranscodeToBuffer(std::string& target,
+const void* buffer,
+size_t size,
+const std::set<DicomTransferSyntax>& allowedSyntaxes,
+bool allowNewSopInstanceUid) ORTHANC_OVERRIDE
+{
+if (tryDcmtk_)
+{
+return dcmtk_.TranscodeToBuffer(target, buffer, size, allowedSyntaxes, allowNewSopInstanceUid);
+}
+else
+{
+return TranscodeInternal(target, buffer, size, allowedSyntaxes, allowNewSopInstanceUid);
+}
+}
+virtual DcmFileFormat* TranscodeToParsed(const void* buffer,
+size_t size,
+const std::set<DicomTransferSyntax>& allowedSyntaxes,
+bool allowNewSopInstanceUid) ORTHANC_OVERRIDE
+{
+if (tryDcmtk_)
+{
+return dcmtk_.TranscodeToParsed(buffer, size, allowedSyntaxes, allowNewSopInstanceUid);
+}
+else
+{
+std::string transcoded;
+if (TranscodeInternal(transcoded, buffer, size, allowedSyntaxes, allowNewSopInstanceUid))
+{
+return FromDcmtkBridge::LoadFromMemoryBuffer(
+transcoded.empty() ? NULL : transcoded.c_str(), transcoded.size());
+}
+else
+{
+return NULL;
+}
+}
+}
+virtual bool HasInplaceTranscode() const ORTHANC_OVERRIDE
+{
+return tryDcmtk_;
+}
+virtual bool InplaceTranscode(DcmFileFormat& dicom,
+const std::set<DicomTransferSyntax>& allowedSyntaxes,
+bool allowNewSopInstanceUid) ORTHANC_OVERRIDE
+{
+if (tryDcmtk_)
+{
+return dcmtk_.InplaceTranscode(dicom, allowedSyntaxes, allowNewSopInstanceUid);
+}
+else
+{
+// "HasInplaceTranscode()" should have been called
+throw OrthancException(ErrorCode_BadSequenceOfCalls);
+}
+}
+};
 }
 TEST(Toto, DISABLED_Transcode3)
 {
 scu.SetCommonClassesProposed(false);
 scu.SetRetiredBigEndianProposed(true);
 DcmtkTranscoder transcoder;
-//for (int j = 0; j < 2; j++)
+for (int j = 0; j < 2; j++)
 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);
 std::string c, i;
 try
-{
-IDicomTranscoder::Store(c, i, scu, transcoder, source.c_str(), source.size());
-}
-catch (OrthancException& e)
-{
-if (e.GetErrorCode() == ErrorCode_NotImplemented)
 {
-LOG(ERROR) << "cannot transcode " << GetTransferSyntaxUid(a);
+IDicomTranscoder::Store(c, i, scu, transcoder, source.c_str(), source.size());
 }
-else
+catch (OrthancException& e)
 {
-throw e;
+if (e.GetErrorCode() == ErrorCode_NotImplemented)
+{
+LOG(ERROR) << "cannot transcode " << GetTransferSyntaxUid(a);
+}
+else
+{
+throw e;
+}
 }
 }
 }
-}
 }

Mercurial > hg > orthanc

comparison UnitTestsSources/FromDcmtkTests.cpp @ 3889:56ce23ba93b7 transcoding