# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1571841769 -7200
# Node ID 3facc5744e2246b602daa99fda8b26171e96dd49
# Parent  71c2dc28a85b32426ce25e2a4cbdfde9a238c9a3# Parent  dead648f8ff1d92348c294574b427c7e1387f7d9
integration mainline->broker

diff -r 71c2dc28a85b -r 3facc5744e22 .hgtags
--- a/.hgtags	Wed Oct 23 11:43:29 2019 +0200
+++ b/.hgtags	Wed Oct 23 16:42:49 2019 +0200
@@ -34,3 +34,5 @@
 7b89e88bb66ebd3cd89d414d1010310c7d4cfbac toa2019100701
 e160159b19057e967f3c8a397f23121fba969bcc toa2019100702
 369050c846a9ca57efdfd15cffb7c240a3ac7417 toa2019102101
+5a18e6a395bc3fcc2915bb169f145027da0702a5 toa2019102301
+df76d308303107cdd327790d3a92b58fa4500f76 toa2019102302
diff -r 71c2dc28a85b -r 3facc5744e22 Framework/Toolbox/DicomInstanceParameters.cpp
--- a/Framework/Toolbox/DicomInstanceParameters.cpp	Wed Oct 23 11:43:29 2019 +0200
+++ b/Framework/Toolbox/DicomInstanceParameters.cpp	Wed Oct 23 16:42:49 2019 +0200
@@ -110,6 +110,15 @@
     if (sopClassUid_ == SopClassUid_RTDose)
     {
       ComputeDoseOffsets(dicom);
+
+      static const Orthanc::DicomTag DICOM_TAG_DOSE_UNITS(0x3004, 0x0002);
+
+      if (!dicom.LookupStringValue(doseUnits_, DICOM_TAG_DOSE_UNITS, false))
+      {
+        LOG(WARNING) << "Tag DoseUnits (0x3004, 0x0002) is missing in " << sopInstanceUid_;
+        doseUnits_ = "";
+      }
+
     }
 
     isColor_ = (imageInformation_.GetPhotometricInterpretation() != Orthanc::PhotometricInterpretation_Monochrome1 &&
diff -r 71c2dc28a85b -r 3facc5744e22 Framework/Toolbox/DicomInstanceParameters.h
--- a/Framework/Toolbox/DicomInstanceParameters.h	Wed Oct 23 11:43:29 2019 +0200
+++ b/Framework/Toolbox/DicomInstanceParameters.h	Wed Oct 23 16:42:49 2019 +0200
@@ -59,6 +59,7 @@
       Orthanc::PixelFormat              expectedPixelFormat_;
       bool                              hasIndexInSeries_;
       unsigned int                      indexInSeries_;
+      std::string                       doseUnits_;
 
       void ComputeDoseOffsets(const Orthanc::DicomMap& dicom);
 
@@ -199,5 +200,10 @@
     }
 
     unsigned int GetIndexInSeries() const;
+
+    const std::string& GetDoseUnits() const
+    {
+      return data_.doseUnits_;
+    }
   };
 }
diff -r 71c2dc28a85b -r 3facc5744e22 Framework/Toolbox/TextRenderer.cpp
--- a/Framework/Toolbox/TextRenderer.cpp	Wed Oct 23 11:43:29 2019 +0200
+++ b/Framework/Toolbox/TextRenderer.cpp	Wed Oct 23 16:42:49 2019 +0200
@@ -21,12 +21,12 @@
 
 #include "TextRenderer.h"
 
-#include <Framework/Scene2D/CairoCompositor.h>
-#include <Framework/Scene2D/ColorTextureSceneLayer.h>
-#include <Framework/Scene2D/FloatTextureSceneLayer.h>
-#include <Framework/Scene2D/TextSceneLayer.h>
-#include <Framework/Fonts/GlyphBitmapAlphabet.h>
-#include <Framework/Fonts/FontRenderer.h>
+#include "../Scene2D/CairoCompositor.h"
+#include "../Scene2D/ColorTextureSceneLayer.h"
+#include "../Scene2D/FloatTextureSceneLayer.h"
+#include "../Scene2D/TextSceneLayer.h"
+#include "../Fonts/GlyphBitmapAlphabet.h"
+#include "../Fonts/FontRenderer.h"
 #include <Core/Images/PngWriter.h>
 #include <Core/Toolbox.h>