Mercurial > hg > orthanc

changeset 2938:d658f5785b7b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author am@osimis.io
date Wed, 28 Nov 2018 14:37:17 +0100
parents 1ab59dfd4afc (diff) 2dfa40b9ca42 (current diff)
children 577786f59252
files
diffstat 4 files changed, 13 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Core/DicomFormat/DicomTag.h	Tue Nov 27 17:09:11 2018 +0100
+++ b/Core/DicomFormat/DicomTag.h	Wed Nov 28 14:37:17 2018 +0100
@@ -183,6 +183,9 @@
   static const DicomTag DICOM_TAG_VIEW_POSITION(0x0018, 0x5101);
   static const DicomTag DICOM_TAG_MANUFACTURER(0x0008, 0x0070);
   static const DicomTag DICOM_TAG_PATIENT_ORIENTATION(0x0020, 0x0020);
+  static const DicomTag DICOM_TAG_PATIENT_COMMENTS(0x0010, 0x4000);
+  static const DicomTag DICOM_TAG_PATIENT_SPECIES_DESCRIPTION(0x0010, 0x2201);
+  static const DicomTag DICOM_TAG_STUDY_COMMENTS(0x0032, 0x4000);
 
   // Tags used within the Stone of Orthanc
   static const DicomTag DICOM_TAG_FRAME_INCREMENT_POINTER(0x0028, 0x0009);
--- a/OrthancServer/OrthancRestApi/OrthancRestAnonymizeModify.cpp	Tue Nov 27 17:09:11 2018 +0100
+++ b/OrthancServer/OrthancRestApi/OrthancRestAnonymizeModify.cpp	Wed Nov 28 14:37:17 2018 +0100
@@ -271,6 +271,7 @@
   {
     if (tags.type() != Json::objectValue)
     {
+      LOG(ERROR) << "Tags field is not an array";
       throw OrthancException(ErrorCode_BadRequest);
     }
 
@@ -296,11 +297,13 @@
             tag != DICOM_TAG_STUDY_TIME &&
             dicom.HasTag(tag))
         {
+          LOG(ERROR) << EnumerationToString(ErrorCode_CreateDicomOverrideTag) << ": " << name;
           throw OrthancException(ErrorCode_CreateDicomOverrideTag);
         }
 
         if (tag == DICOM_TAG_PIXEL_DATA)
         {
+          LOG(ERROR) << EnumerationToString(ErrorCode_CreateDicomUseContent);
           throw OrthancException(ErrorCode_CreateDicomUseContent);
         }
         else
--- a/OrthancServer/OrthancRestApi/OrthancRestResources.cpp	Tue Nov 27 17:09:11 2018 +0100
+++ b/OrthancServer/OrthancRestApi/OrthancRestResources.cpp	Wed Nov 28 14:37:17 2018 +0100
@@ -529,7 +529,7 @@
     }
     catch (OrthancException& e)
     {
-      if (e.GetErrorCode() == ErrorCode_ParameterOutOfRange)
+      if (e.GetErrorCode() == ErrorCode_ParameterOutOfRange || e.GetErrorCode() == ErrorCode_UnknownResource)
       {
         // The frame number is out of the range for this DICOM
         // instance, the resource is not existent
@@ -544,6 +544,7 @@
 
         call.GetOutput().Redirect(root + "app/images/unsupported.png");
       }
+      return;
     }
 
     ImageToEncode image(decoded, mode, invert);
--- a/Plugins/Samples/Common/FullOrthancDataset.h	Tue Nov 27 17:09:11 2018 +0100
+++ b/Plugins/Samples/Common/FullOrthancDataset.h	Wed Nov 28 14:37:17 2018 +0100
@@ -65,5 +65,10 @@
 
     virtual bool GetSequenceSize(size_t& size,
                                  const DicomPath& path) const;
+
+    FullOrthancDataset* Clone() const
+    {
+      return new FullOrthancDataset(this->root_);
+    }
   };
 }