Mercurial > hg > orthanc-stone

changeset 1747:730604db88b8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Benjamin Golinvaux <bgo@osimis.io>
date Fri, 12 Feb 2021 11:09:07 +0100
parents 4bedae500652 (current diff) 9b69970fbdb5 (diff)
children b6a6ad64192a
files
diffstat 5 files changed, 8 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/Applications/Resources/Colormaps/GenerateColormaps.py	Fri Feb 12 10:41:17 2021 +0100
+++ b/Applications/Resources/Colormaps/GenerateColormaps.py	Fri Feb 12 11:09:07 2021 +0100
@@ -37,9 +37,9 @@
 
         colormap += map(lambda k: int(round(color[k] * 255)), range(3))
 
-    colormap[0] = 0
-    colormap[1] = 0
-    colormap[2] = 0
+    #colormap[0] = 0
+    #colormap[1] = 0
+    #colormap[2] = 0
 
     return array.array('B', colormap).tostring()
 
Binary file Applications/Resources/Colormaps/hot.lut has changed
Binary file Applications/Resources/Colormaps/jet.lut has changed
--- a/Applications/Samples/README.md	Fri Feb 12 10:41:17 2021 +0100
+++ b/Applications/Samples/README.md	Fri Feb 12 11:09:07 2021 +0100
@@ -231,6 +231,7 @@
 ./RtViewerSdl --orthanc http://localhost:8042 --ctseries a04ecf01-79b2fc33-58239f7e-ad9db983-28e81afa --rtdose 830a69ff-8e4b5ee3-b7f966c8-bccc20fb-d322dceb --rtstruct 54460695-ba3885ee-ddf61ac0-f028e31d-a6e474d9
 ```
 
+
 RtViewer
 ---------------
 
--- a/OrthancStone/Sources/Loaders/SeriesThumbnailsLoader.cpp	Fri Feb 12 10:41:17 2021 +0100
+++ b/OrthancStone/Sources/Loaders/SeriesThumbnailsLoader.cpp	Fri Feb 12 11:09:07 2021 +0100
@@ -508,19 +508,16 @@
       dynamic_cast<const ParseDicomFromWadoCommand&>(message.GetOrigin());
     const ThumbnailInformation& info = dynamic_cast<ThumbnailInformation&>(origin.GetPayload());
 
-    std::string tmp;
     Orthanc::DicomTransferSyntax transferSyntax;
-    if (!message.GetDicom().LookupTransferSyntax(tmp))
-    {
-      
+    if (!message.GetDicom().LookupTransferSyntax(transferSyntax))
+    {      
       throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat,
                                       "DICOM instance without a transfer syntax: " + origin.GetSopInstanceUid());
     }
-    else if (!Orthanc::LookupTransferSyntax(transferSyntax, tmp) ||
-             !ImageToolbox::IsDecodingSupported(transferSyntax))
+    else if (!ImageToolbox::IsDecodingSupported(transferSyntax))
     {
       LOG(INFO) << "Asking the DICOMweb server to transcode, "
-                << "as I don't support this transfer syntax: " << tmp;
+                << "as I don't support this transfer syntax: " << Orthanc::GetTransferSyntaxUid(transferSyntax);
 
       Schedule(ParseDicomFromWadoCommand::Create(
                  origin.GetSource(), info.GetStudyInstanceUid(), info.GetSeriesInstanceUid(),