Mercurial > hg > orthanc-stone

diff Framework/Radiography/RadiographySceneReader.h @ 860:238693c3bc51 am-dev

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge default -> am-dev
author Alain Mazy <alain@mazy.be>
date Mon, 24 Jun 2019 14:35:00 +0200
parents be9c1530d40a
children 1e80a925323a
line wrap: on
line diff
--- a/Framework/Radiography/RadiographySceneReader.h	Wed Jun 19 17:36:33 2019 +0200
+++ b/Framework/Radiography/RadiographySceneReader.h	Mon Jun 24 14:35:00 2019 +0200
@@ -26,7 +26,7 @@
 #include "RadiographyDicomLayer.h"
 #include "RadiographyMaskLayer.h"
 #include "RadiographyTextLayer.h"
-#include "../Toolbox/OrthancApiClient.h"
+#include "../Deprecated/Toolbox/OrthancApiClient.h"
 
 #include <json/value.h>
 #include <Core/Images/FontRegistry.h>
@@ -42,8 +42,8 @@
     RadiographyScene&                               scene_;
     const Orthanc::FontRegistry*                    fontRegistry_;
     std::auto_ptr<Orthanc::ImageAccessor>           dicomImage_;
-    std::auto_ptr<Deprecated::DicomFrameConverter>              dicomFrameConverter_;
-    PhotometricDisplayMode                          preferredPhotometricDisplayMode_;
+    std::auto_ptr<Deprecated::DicomFrameConverter>  dicomFrameConverter_;
+    RadiographyPhotometricDisplayMode               preferredPhotometricDisplayMode_;
 
   public:
     RadiographySceneBuilder(RadiographyScene& scene) :
@@ -56,7 +56,7 @@
     void Read(const Json::Value& input,
               Orthanc::ImageAccessor* dicomImage, // takes ownership
               Deprecated::DicomFrameConverter* dicomFrameConverter, // takes ownership
-              PhotometricDisplayMode preferredPhotometricDisplayMode
+              RadiographyPhotometricDisplayMode preferredPhotometricDisplayMode
               );
 
     void SetFontRegistry(const Orthanc::FontRegistry& fontRegistry)